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

NOISSUE ask user if closing is OK when instances are still running

Browse Source
This commit is contained in:
Petr Mrázek 2016-11-06 23:01:08 +01:00
parent 8b952b3870
commit 1276ecdbb7
3 changed files with 32 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
application/MainWindow.cpp
View File

@ -1356,12 +1356,27 @@ void MainWindow::on_actionViewSelectedInstFolder_triggered()
void MainWindow::closeEvent(QCloseEvent *event)
{
// Save the window state and geometry.
if(MMC->numRunningInstances())
{
auto resBtn = QMessageBox::question(
this,
tr("Do you want to close MultiMC?"),
tr("<p>You still have instances running.</p><p>Closing MultiMC will result in inaccurate time tracking and no Minecraft crash handling.</p><p>Are you sure?</p>"),
QMessageBox::No | QMessageBox::Yes,
QMessageBox::Yes
);
if (resBtn != QMessageBox::Yes)
{
event->ignore();
return;
}
}
// no running instances or user said yes.
event->accept();
// Save the window state and geometry.
MMC->settings()->set("MainWindowState", saveState().toBase64());
MMC->settings()->set("MainWindowGeometry", saveGeometry().toBase64());
QMainWindow::closeEvent(event);
QApplication::exit();
}

10
application/MultiMC.cpp
View File

@ -1104,6 +1104,7 @@ void MultiMC::launch(InstancePtr instance, bool online, BaseProfilerFactory *pro
connect(controller.get(), &LaunchController::succeeded, this, &MultiMC::controllerSucceeded);
connect(controller.get(), &LaunchController::failed, this, &MultiMC::controllerFailed);
controller->start();
m_runningInstances ++;
}
else if (instance->isRunning())
{
@ -1118,6 +1119,7 @@ void MultiMC::controllerSucceeded()
return;
auto id = controller->id();
auto & extras = m_instanceExtras[id];
// on success, do...
if (controller->instance()->settings()->get("AutoCloseConsole").toBool())
{
@ -1127,8 +1129,10 @@ void MultiMC::controllerSucceeded()
}
}
extras.controller.reset();
m_runningInstances --;
// quit when there are no more windows.
if(m_openWindows == 0)
if(m_openWindows == 0 && m_runningInstances == 0)
{
m_status = Status::Succeeded;
quit();
@ -1146,8 +1150,10 @@ void MultiMC::controllerFailed(const QString& error)
// on failure, do... nothing
extras.controller.reset();
m_runningInstances --;
// quit when there are no more windows.
if(m_openWindows == 0)
if(m_openWindows == 0 && m_runningInstances == 0)
{
m_status = Status::Failed;
quit();

6
application/MultiMC.h
View File

@ -144,6 +144,11 @@ public:
InstanceWindow *showInstanceWindow(InstancePtr instance, QString page = QString());
MainWindow *showMainWindow(bool minimized = false);
size_t numRunningInstances()
{
return m_runningInstances;
}
public slots:
void launch(InstancePtr instance, bool online = true, BaseProfilerFactory *profiler = nullptr);
@ -208,6 +213,7 @@ private:
};
std::map<QString, InstanceXtras> m_instanceExtras;
size_t m_openWindows = 0;
size_t m_runningInstances = 0;
// main window, if any
MainWindow * m_mainWindow = nullptr;