Ticket #8004: backendconnectionmanager.cpp_r23487.diff

File backendconnectionmanager.cpp_r23487.diff, 1.3 KB (added by Johnny Walker <johnnyjboss@…>, 16 years ago)

The correct diff for .23 (trunk)

  • programs/mythfrontend/backendconnectionmanager.cpp

     
    66#include <QTimer>
    77
    88#include "mythcontext.h"
     9#include "mythdialogbox.h"
     10#include "mythscreenstack.h"
     11#include "mythmainwindow.h"
    912#include "exitcodes.h"
    1013#include "util.h" // for checkTimeZone()
    1114#include "backendconnectionmanager.h"
     
    8285                VERBOSE(VB_IMPORTANT,
    8386                        "Unable to run with invalid time settings. "
    8487                        "Exiting.");
    85                 qApp->exit(FRONTEND_EXIT_INVALID_TIMEZONE);
     88                // adding friendlier message on popup
     89                MythScreenStack *ss = GetMythMainWindow()->GetStack("popup stack");
     90                MythConfirmationDialog *mcd = new MythConfirmationDialog(ss, tr("Time Zone Mismatch, Please review your logs for further details. Exiting."), false);
     91                if (!mcd->Create())
     92                        qApp->exit(FRONTEND_EXIT_INVALID_TIMEZONE);
     93                QObject::connect( mcd, SIGNAL( haveResult(bool) ), qApp, SLOT( quit() ) );
     94                mcd->SetVisible(true);
     95                ss->AddScreen(mcd);                     
    8696            }
    8797            m_first_time = false;
    8898        }