empathicqubit/Mesen-X
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Linux: Fixed startup crash (due to earlier commit)

Browse source
This commit is contained in:
Sour 2018-06-16 15:47:06 -04:00
parent 7619b93cfe
commit 130b923a0b
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Core/Console.cpp
View file

@ -872,7 +872,7 @@ ConsoleFeatures Console::GetAvailableFeatures()
{ {
ConsoleFeatures features = ConsoleFeatures::None; ConsoleFeatures features = ConsoleFeatures::None;
shared_ptr<BaseMapper> mapper = _mapper; shared_ptr<BaseMapper> mapper = _mapper;
shared_ptr<ControlManager> controlManager = controlManager; shared_ptr<ControlManager> controlManager = _controlManager;
if(mapper && controlManager) { if(mapper && controlManager) {
features = (ConsoleFeatures)((int)features | (int)mapper->GetAvailableFeatures()); features = (ConsoleFeatures)((int)features | (int)mapper->GetAvailableFeatures());
@ -894,7 +894,7 @@ ConsoleFeatures Console::GetAvailableFeatures()
void Console::InputBarcode(uint64_t barcode, uint32_t digitCount) void Console::InputBarcode(uint64_t barcode, uint32_t digitCount)
{ {
shared_ptr<BaseMapper> mapper = _mapper; shared_ptr<BaseMapper> mapper = _mapper;
shared_ptr<ControlManager> controlManager = controlManager; shared_ptr<ControlManager> controlManager = _controlManager;
if(mapper) { if(mapper) {
shared_ptr<IBarcodeReader> barcodeReader = std::dynamic_pointer_cast<IBarcodeReader>(mapper->GetMapperControlDevice()); shared_ptr<IBarcodeReader> barcodeReader = std::dynamic_pointer_cast<IBarcodeReader>(mapper->GetMapperControlDevice());