Properly handle title disam. diag cancellation

oblivioncth · Nov 27, 2023 · 1bae49d · 1bae49d
1 parent ec6ff16
commit 1bae49d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 0 deletions.
diff --git a/app/src/command/c-play.cpp b/app/src/command/c-play.cpp
@@ -314,6 +314,9 @@ Qx::Error CPlay::perform()
     else if(Qx::Error ide = getTitleId(titleId); ide.isValid())
         return ide;
 
+    // Bail if ID is missing (user cancel)
+    if(titleId.isNull())
+        return CPlayError();
 
     logEvent(LOG_EVENT_HANDLING_AUTO);
 

diff --git a/app/src/kernel/driver.cpp b/app/src/kernel/driver.cpp
@@ -163,6 +163,8 @@ void Driver::cleanup()
 
 void Driver::finish()
 {
+    logEvent(LOG_EVENT_FINISH);
+
     // Clear update cache
     if(CUpdate::isUpdateCacheClearable())
     {

diff --git a/app/src/kernel/driver.h b/app/src/kernel/driver.h
@@ -82,6 +82,7 @@ class Driver : public QObject
     static inline const QString LOG_EVENT_QUIT_REQUEST_REDUNDANT = u"Received redundant quit request"_s;
     static inline const QString LOG_EVENT_CLEARED_UPDATE_CACHE = u"Cleared stale update cache."_s;
     static inline const QString LOG_EVENT_CORE_ABORT = u"Core abort signaled, quitting now."_s;
+    static inline const QString LOG_EVENT_FINISH = u"Finishing run..."_s;
 
     // Meta
     static inline const QString NAME = u"driver"_s;