summaryrefslogtreecommitdiff
path: root/src/wx/text_panel.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2024-01-08 16:25:42 +0100
committerCarl Hetherington <cth@carlh.net>2024-01-09 11:54:16 +0100
commit12d1abf033654727d6ab6278087ff7cfc65d63f6 (patch)
treeb920b3c3614fc91a1cb2a220972042e6318a6fd4 /src/wx/text_panel.cc
parentad41d2dd987ffcd2068d9fbf4273108c9f796762 (diff)
Move ScopeGuard into libdcp.
Diffstat (limited to 'src/wx/text_panel.cc')
-rw-r--r--src/wx/text_panel.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/wx/text_panel.cc b/src/wx/text_panel.cc
index 3b7973e30..78c024565 100644
--- a/src/wx/text_panel.cc
+++ b/src/wx/text_panel.cc
@@ -42,12 +42,12 @@
#include "lib/ffmpeg_subtitle_stream.h"
#include "lib/film.h"
#include "lib/job_manager.h"
-#include "lib/scope_guard.h"
#include "lib/string_text_file_content.h"
#include "lib/string_text_file_decoder.h"
#include "lib/subtitle_analysis.h"
#include "lib/text_content.h"
#include <dcp/filesystem.h>
+#include <dcp/scope_guard.h>
#include <dcp/warnings.h>
LIBDCP_DISABLE_WARNINGS
#include <wx/spinctrl.h>
@@ -813,7 +813,7 @@ TextPanel::try_to_load_analysis ()
}
_loading_analysis = true;
- ScopeGuard sg = [this]() {
+ dcp::ScopeGuard sg = [this]() {
_loading_analysis = false;
setup_sensitivity();
};