From 9f22684ceac9e5fa8c0c5ec05b4ac4bbf4e4880d Mon Sep 17 00:00:00 2001
From: Connor McLaughlin <stenzek@gmail.com>
Date: Sat, 23 May 2020 15:03:15 +1000
Subject: [PATCH] Qt: Combine resume and power off toolbar buttons

---
 src/duckstation-qt/mainwindow.cpp | 17 +++++++++++++++++
 src/duckstation-qt/mainwindow.ui  |  3 +--
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/duckstation-qt/mainwindow.cpp b/src/duckstation-qt/mainwindow.cpp
index 8dd37fd3f..661120071 100644
--- a/src/duckstation-qt/mainwindow.cpp
+++ b/src/duckstation-qt/mainwindow.cpp
@@ -468,6 +468,23 @@ void MainWindow::updateEmulationActions(bool starting, bool running)
     m_status_frame_time_widget->hide();
   }
 
+  if (starting || running)
+  {
+    if (!m_ui.toolBar->actions().contains(m_ui.actionPowerOff))
+    {
+      m_ui.toolBar->insertAction(m_ui.actionResumeLastState, m_ui.actionPowerOff);
+      m_ui.toolBar->removeAction(m_ui.actionResumeLastState);
+    }
+  }
+  else
+  {
+    if (!m_ui.toolBar->actions().contains(m_ui.actionResumeLastState))
+    {
+      m_ui.toolBar->insertAction(m_ui.actionPowerOff, m_ui.actionResumeLastState);
+      m_ui.toolBar->removeAction(m_ui.actionPowerOff);
+    }
+  }
+
   m_ui.statusBar->clearMessage();
 }
 
diff --git a/src/duckstation-qt/mainwindow.ui b/src/duckstation-qt/mainwindow.ui
index fe0b3aa41..5f4192bfa 100644
--- a/src/duckstation-qt/mainwindow.ui
+++ b/src/duckstation-qt/mainwindow.ui
@@ -165,9 +165,8 @@
    </attribute>
    <addaction name="actionStartDisc"/>
    <addaction name="actionStartBios"/>
-   <addaction name="actionResumeLastState"/>
    <addaction name="separator"/>
-   <addaction name="actionPowerOff"/>
+   <addaction name="actionResumeLastState"/>
    <addaction name="actionReset"/>
    <addaction name="actionPause"/>
    <addaction name="actionChangeDisc"/>