Merge master.

diff --git a/ChangeLog b/ChangeLog
index a15a44fe2b47595196af0f9a5b1db90a7bc7c49a..0a1f804b93789b8ac1ad807443f0ba0f33ea22d1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 32ab78e759c029da22d8c200b9d3a08bd93886fb..5bc42201adadffd8ee358fc6410b22fd78944b0f 100644 (file)
--- 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 0224e461d5fb8193fe82841ecdb34051711b2f6a..d84c17c55b25318ef5b32a0a06eda8ee23ac1d16 100644 (file)
--- 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 1b9e281a749c2ab58c9c7cf77b526072654c5ae5..df9c6f5f1d996dfcbccff08753d71b5789c007c6 100644 (file)
--- 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;