From f2954b2d31e00ff6d92a4fe00488a7d0d9792872 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 16 Jul 2014 16:10:58 +0000 Subject: Bump version --- ChangeLog | 4 ++++ debian/changelog | 5 +++-- wscript | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index e225fb565..bc387ac2c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-07-16 Carl Hetherington + + * Version 1.72.4 released. + 2014-07-16 Carl Hetherington * 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 Wed, 16 Jul 2014 14:26:32 +0000 + -- Carl Hetherington Wed, 16 Jul 2014 16:10:58 +0000 dcpomatic (0.87-1) UNRELEASED; urgency=low diff --git a/wscript b/wscript index 3e82c62e8..02274cd87 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.72.3devel' +VERSION = '1.72.4' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From b1101aa464f3b7cca89dfb868dd573b6d9bde195 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 16 Jul 2014 16:10:58 +0000 Subject: Bump version --- wscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wscript b/wscript index 02274cd87..5ad4332a4 100644 --- a/wscript +++ b/wscript @@ -3,7 +3,7 @@ import os import sys APPNAME = 'dcpomatic' -VERSION = '1.72.4' +VERSION = '1.72.4devel' def options(opt): opt.load('compiler_cxx') -- cgit v1.2.3 From 278037ebfb816ad39f8546a194131e89803e7075 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 17 Jul 2014 09:57:24 +0100 Subject: Speculative fix for failure to keep the computer awake during encodes on Windows. --- ChangeLog | 5 +++++ src/lib/cross.cc | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index bc387ac2c..4e256addd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2014-07-17 Carl Hetherington + + * Speculative fix for failure to keep Windows + machines awake during encodes. + 2014-07-16 Carl Hetherington * Version 1.72.4 released. 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 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(-) diff --git a/ChangeLog b/ChangeLog index 4e256addd..e550ddf3f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2014-07-17 Carl Hetherington + * 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 ("" + _job->name () + ""); + string const jn = "" + _job->name () + ""; + _name->SetLabelMarkup (std_to_wx (jn)); table->Insert (n, _name, 0, wxALIGN_CENTER_VERTICAL | wxALL, 6); ++n; -- cgit v1.2.3