The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-01-24 23:11:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

QT: add exit function

Browse Source
This commit is contained in:
Simon McFarlane 2015-05-02 02:36:54 -07:00
parent a76bfb1f55
commit 629f45f1a5
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Source/Core/DolphinQt/MainWindow.cpp
View File

@ -57,6 +57,7 @@ DMainWindow::DMainWindow(QWidget* parent_widget)
connect(this, SIGNAL(CoreStateChanged(Core::EState)), this, SLOT(OnCoreStateChanged(Core::EState)));
connect(m_ui->actionOpen, SIGNAL(triggered()), this, SLOT(OnOpen()));
connect(m_ui->actionExit, SIGNAL(triggered()), this, SLOT(OnExit()));
connect(m_ui->actionListView, SIGNAL(triggered()), this, SLOT(OnGameListStyleChanged()));
connect(m_ui->actionTreeView, SIGNAL(triggered()), this, SLOT(OnGameListStyleChanged()));
@ -165,6 +166,14 @@ void DMainWindow::OnOpen()
StartGame(filename);
}
void DMainWindow::OnExit()
{
close();
if (Core::GetState() == Core::CORE_UNINITIALIZED || m_isStopping)
return;
Stop();
}
void DMainWindow::OnPlay()
{
if (Core::GetState() != Core::CORE_UNINITIALIZED)
@ -183,7 +192,7 @@ void DMainWindow::OnPlay()
bool DMainWindow::OnStop()
{
if (Core::GetState() == Core::CORE_UNINITIALIZED || m_isStopping)
return true; // We're already stopped/stopping
return true;
// Ask for confirmation in case the user accidentally clicked Stop / Escape
if (SConfig::GetInstance().m_LocalCoreStartupParameter.bConfirmStop)
@ -203,6 +212,11 @@ bool DMainWindow::OnStop()
}
}
return Stop();
}
bool DMainWindow::Stop()
{
m_isStopping = true;
// TODO: Movie stuff

2
Source/Core/DolphinQt/MainWindow.h
View File

@ -44,6 +44,7 @@ private slots:
// Main toolbar
void OnOpen();
void OnExit();
void OnPlay();
// View menu
@ -67,6 +68,7 @@ private:
QString RequestBootFilename();
QString ShowFileDialog();
void DoStartPause();
bool Stop();
std::unique_ptr<DRenderWidget> m_render_widget;
bool m_isStopping = false;