diff options
| author | Carl Hetherington <cth@carlh.net> | 2019-10-21 17:25:16 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2019-10-21 17:25:16 +0200 |
| commit | dfd42d2a546d14c32057a34002543877ea2f99cb (patch) | |
| tree | ccaf3c3edd37c9022bd39f8e263b7f025d550011 /src/wx | |
| parent | 48b82de5b6e8e07330a2f72dbddd8d9830fe047e (diff) | |
| parent | 74d4cd23df7460cf1d0e91fd7a37fa3333741887 (diff) | |
Merge branch 'v2.15.x' of ssh://localhost:2222/home/carl/git/dcpomatic into v2.15.x
Diffstat (limited to 'src/wx')
| -rw-r--r-- | src/wx/content_view.cc | 2 | ||||
| -rw-r--r-- | src/wx/wx_util.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/wx/content_view.cc b/src/wx/content_view.cc index d4ef39cb9..1cdfbc00f 100644 --- a/src/wx/content_view.cc +++ b/src/wx/content_view.cc @@ -109,7 +109,7 @@ ContentView::update () } return; } - dcpomatic_sleep (1); + dcpomatic_sleep_seconds (1); } /* Add content from successful jobs and report errors */ diff --git a/src/wx/wx_util.cc b/src/wx/wx_util.cc index 045712bcb..28f79431a 100644 --- a/src/wx/wx_util.cc +++ b/src/wx/wx_util.cc @@ -517,7 +517,7 @@ display_progress (wxString title, wxString task) bool ok = true; while (jm->work_to_do()) { - dcpomatic_sleep (1); + dcpomatic_sleep_seconds (1); if (!progress.Pulse()) { /* user pressed cancel */ BOOST_FOREACH (shared_ptr<Job> i, jm->get()) { |