Tidy up MythConfirmationDialog::ShowOkPopup()

Signed-off-by: Stuart Morgan <smorgan@mythtv.org>
MythTV · Jul 6, 2012 · 2699d86 · 2699d86
1 parent ca27332
commit 2699d86
Showing 1 changed file with 12 additions and 16 deletions.
diff --git a/mythtv/libs/libmythui/mythdialogbox.cpp b/mythtv/libs/libmythui/mythdialogbox.cpp
@@ -575,25 +575,21 @@ MythConfirmationDialog  *ShowOkPopup(const QString &message, QObject *parent,
     MythConfirmationDialog  *pop;
     MythScreenStack         *stk = NULL;
 
+    MythMainWindow *win = GetMythMainWindow();
 
-    if (!stk)
+    if (win)
+        stk = win->GetStack("popup stack");
+    else
     {
-        MythMainWindow *win = GetMythMainWindow();
-
-        if (win)
-            stk = win->GetStack("popup stack");
-        else
-        {
-            LOG(VB_GENERAL, LOG_ERR, LOC + "no main window?");
-            return NULL;
-        }
+        LOG(VB_GENERAL, LOG_ERR, LOC + "no main window?");
+        return NULL;
+    }
 
-        if (!stk)
-        {
-            LOG(VB_GENERAL, LOG_ERR, LOC + "no popup stack? "
-                                           "Is there a MythThemeBase?");
-            return NULL;
-        }
+    if (!stk)
+    {
+        LOG(VB_GENERAL, LOG_ERR, LOC + "no popup stack? "
+                                       "Is there a MythThemeBase?");
+        return NULL;
     }
 
     pop = new MythConfirmationDialog(stk, message, showCancel);