From 278037ebfb816ad39f8546a194131e89803e7075 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Thu, 17 Jul 2014 09:57:24 +0100
Subject: Speculative fix for failure to keep the computer awake during encodes
 on Windows.

---
 src/lib/cross.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/lib/cross.cc b/src/lib/cross.cc
index e30cf6459..9b7d5594f 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	
 }
 
-- 
cgit v1.2.3


From d12a848916fb4fab0d1a14c6e72cfc0c8139255a Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Thu, 17 Jul 2014 10:36:05 +0100
Subject: Missing std_to_wx().

Reported-by: Carsten Kurz
---
 ChangeLog                  | 2 ++
 src/wx/job_manager_view.cc | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/ChangeLog b/ChangeLog
index 4e256addd..e550ddf3f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 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.
 
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;
 	
-- 
cgit v1.2.3