Ticket #9102: proper_shutdown_behavior_for_ubuntu.patch

programs/mythfrontend/exitprompt.cpp

@@ -64 +64 @@
 {
 
     QString halt_cmd = gCoreContext->GetSetting("HaltCommand","");
+    int ret = -1;
     if (!halt_cmd.isEmpty()) /* Use user specified command if it exists */
     {
-        myth_system(halt_cmd);
-    } else if (!DBusHalt()) /* If supported, use DBus to shutdown */
+        ret = myth_system(halt_cmd);
+    }
+    if (ret != 0 && !DBusHalt()) /* If supported, use DBus to shutdown */
     {
         myth_system("sudo /sbin/halt -p"); 
     }
@@ -120 +122 @@
 {
 
     QString reboot_cmd = gCoreContext->GetSetting("RebootCommand","");
+    int ret = -1;
     if (!reboot_cmd.isEmpty()) /* Use user specified command if it exists */
     {
-        myth_system(reboot_cmd);
-    } else if (!DBusReboot()) /* If supported, use DBus to reboot */
+        ret = myth_system(reboot_cmd);
+    }
+    if (ret != 0 && !DBusReboot()) /* If supported, use DBus to reboot */
     {
         myth_system("sudo /sbin/reboot");
     }