← Back to branch summary

~ubuntu-branches/ubuntu/natty/mythtv/natty

« back to all changes in this revision

Viewing changes to libs/libmythui/mythsystem.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Mario Limonciello, Mario Limonciello, Thomas Mashos
  • Date: 2010-06-20 00:11:00 UTC
  • mfrom: (1.1.53 upstream)
  • Revision ID: james.westby@ubuntu.com-20100620001100-yulpns6qg4ksmay6
Tags: 0.23.0+fixes25138-0ubuntu1
https://launchpad.net/bugs/581283
https://launchpad.net/bugs/556204
https://launchpad.net/bugs/574877
[ Mario Limonciello ]
* new upstream checkout (25138)

[ Thomas Mashos ]
* Added missingok for mirobridge log in logrotate (LP: #581283)
* Backend now waits for udev to finish (LP: #556204)
* Added patch to properly detect dbus during compile (LP: #574877)

Show diffs side-by-side

added added

removed removed

Lines of Context:
libs/libmythui/mythsystem.cpp
55
55
{
56
56
    (void)flags; /* Kill warning */
57
57
 
58
 
    bool ready_to_lock = HasMythMainWindow();
 
58
    bool ready_to_lock = HasMythMainWindow() && IsUIThread();
59
59
 
60
60
    (void)ready_to_lock; /* Kill warning */
61
61
 
189
189
    {
190
190
        VERBOSE(VB_IMPORTANT, (LOC_ERR + "CreateProcess() failed because %1")
191
191
                .arg(::GetLastError()));
192
 
        return MYTHSYSTEM__EXIT__EXECL_ERROR;
 
192
        result = MYTHSYSTEM__EXIT__EXECL_ERROR;
193
193
    }
194
194
    else
195
195
    {
204
204
                    .arg(::GetLastError()));
205
205
        CloseHandle(pi.hProcess);
206
206
        CloseHandle(pi.hThread);
207
 
        return exitcode;
 
207
        result = exitcode;
208
208
    }
209
209
#endif
210
210