Merge pull request #6719 from spycrab/qt_batch

Qt: Implement Batch flag (-b)
This commit is contained in:
Mat M 2018-04-29 14:23:46 -04:00 committed by GitHub
commit 1aebe515d9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 1 deletions

View File

@ -87,6 +87,7 @@ int main(int argc, char* argv[])
UICommon::Init(); UICommon::Init();
Resources::Init(); Resources::Init();
Settings::Instance().SetDebugModeEnabled(options.is_set("debugger")); Settings::Instance().SetDebugModeEnabled(options.is_set("debugger"));
Settings::Instance().SetBatchModeEnabled(options.is_set("batch"));
// Hook up alerts from core // Hook up alerts from core
RegisterMsgAlertHandler(QtMsgAlertHandler); RegisterMsgAlertHandler(QtMsgAlertHandler);

View File

@ -526,7 +526,7 @@ void MainWindow::OnStopComplete()
m_stop_requested = false; m_stop_requested = false;
HideRenderWidget(); HideRenderWidget();
if (m_exit_requested) if (m_exit_requested || Settings::Instance().IsBatchModeEnabled())
QGuiApplication::instance()->quit(); QGuiApplication::instance()->quit();
// If the current emulation prevented the booting of another, do that now // If the current emulation prevented the booting of another, do that now

View File

@ -416,3 +416,12 @@ bool Settings::AreWidgetsLocked() const
{ {
return GetQSettings().value(QStringLiteral("widgets/locked"), true).toBool(); return GetQSettings().value(QStringLiteral("widgets/locked"), true).toBool();
} }
bool Settings::IsBatchModeEnabled() const
{
return m_batch;
}
void Settings::SetBatchModeEnabled(bool batch)
{
m_batch = batch;
}

View File

@ -70,6 +70,8 @@ public:
// Emulation // Emulation
int GetStateSlot() const; int GetStateSlot() const;
void SetStateSlot(int); void SetStateSlot(int);
bool IsBatchModeEnabled() const;
void SetBatchModeEnabled(bool batch);
// Graphics // Graphics
void SetHideCursor(bool hide_cursor); void SetHideCursor(bool hide_cursor);
@ -147,6 +149,7 @@ signals:
void AnalyticsToggled(bool enabled); void AnalyticsToggled(bool enabled);
private: private:
bool m_batch = false;
bool m_controller_state_needed = false; bool m_controller_state_needed = false;
std::unique_ptr<NetPlayClient> m_client; std::unique_ptr<NetPlayClient> m_client;
std::unique_ptr<NetPlayServer> m_server; std::unique_ptr<NetPlayServer> m_server;