diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-07-17 10:45:16 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-07-17 10:45:16 +0100 |
| commit | d2137ac5db409e686b4d9b3fa567935a5e416d41 (patch) | |
| tree | f4430ede9d6975ab9a4d21d6b546c8392f10ff67 | |
| parent | 40b654453c2ce0b266f43c36f1b9a5d1705f983c (diff) | |
| parent | d12a848916fb4fab0d1a14c6e72cfc0c8139255a (diff) | |
Merge master.
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | debian/changelog | 5 | ||||
| -rw-r--r-- | src/lib/cross.cc | 2 | ||||
| -rw-r--r-- | src/wx/job_manager_view.cc | 3 |
4 files changed, 17 insertions, 4 deletions
@@ -12,6 +12,17 @@ * Add subtitle view. +2014-07-17 Carl Hetherington <cth@carlh.net> + + * Fix corrupted text in job descriptions in some cases. + + * Speculative fix for failure to keep Windows + machines awake during encodes. + +2014-07-16 Carl Hetherington <cth@carlh.net> + + * Version 1.72.4 released. + 2014-07-16 Carl Hetherington <cth@carlh.net> * Add default scaling setting to preferences (#384). diff --git a/debian/changelog b/debian/changelog index 32ab78e75..5bc42201a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -dcpomatic (1.72.3-1) UNRELEASED; urgency=low +dcpomatic (1.72.4-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. @@ -168,8 +168,9 @@ dcpomatic (1.72.3-1) UNRELEASED; urgency=low * New upstream release. * New upstream release. * New upstream release. + * New upstream release. - -- Carl Hetherington <carl@107.191.37.242.vultr.com> Wed, 16 Jul 2014 14:26:32 +0000 + -- Carl Hetherington <carl@107.191.37.242.vultr.com> Wed, 16 Jul 2014 16:10:58 +0000 dcpomatic (0.87-1) UNRELEASED; urgency=low diff --git a/src/lib/cross.cc b/src/lib/cross.cc index 0224e461d..d84c17c55 100644 --- a/src/lib/cross.cc +++ b/src/lib/cross.cc @@ -310,7 +310,7 @@ void Waker::nudge () { #ifdef DCPOMATIC_WINDOWS - SetThreadExecutionState (ES_CONTINUOUS); + SetThreadExecutionState (ES_SYSTEM_REQUIRED); #endif } diff --git a/src/wx/job_manager_view.cc b/src/wx/job_manager_view.cc index 1b9e281a7..df9c6f5f1 100644 --- a/src/wx/job_manager_view.cc +++ b/src/wx/job_manager_view.cc @@ -49,7 +49,8 @@ public: int n = 0; _name = new wxStaticText (panel, wxID_ANY, ""); - _name->SetLabelMarkup ("<b>" + _job->name () + "</b>"); + string const jn = "<b>" + _job->name () + "</b>"; + _name->SetLabelMarkup (std_to_wx (jn)); table->Insert (n, _name, 0, wxALIGN_CENTER_VERTICAL | wxALL, 6); ++n; |