0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

GH-1854 prevent a crash if the instance is closed while the kill confirmation dialog is open

Browse Source
This commit is contained in:
Petr Mrázek 2017-04-14 10:41:52 +02:00
parent be53eb66f8
commit 910766458d
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
application/MultiMC.cpp
View File

@ -1001,7 +1001,8 @@ bool MultiMC::kill(InstancePtr instance)
return false; return false;
} }
auto & extras = m_instanceExtras[instance->id()]; auto & extras = m_instanceExtras[instance->id()];
auto & controller = extras.controller; // NOTE: copy of the shared pointer keeps it alive
auto controller = extras.controller;
if(controller) if(controller)
{ {
return controller->abort(); return controller->abort();

2
application/MultiMC.h
View File

@ -214,7 +214,7 @@ private:
struct InstanceXtras struct InstanceXtras
{ {
InstanceWindow * window = nullptr; InstanceWindow * window = nullptr;
unique_qobject_ptr<LaunchController> controller; shared_qobject_ptr<LaunchController> controller;
}; };
std::map<QString, InstanceXtras> m_instanceExtras; std::map<QString, InstanceXtras> m_instanceExtras;
size_t m_openWindows = 0; size_t m_openWindows = 0;