projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cleanup: move variable assignment that happens in every branch.
[dcpomatic.git]
/
src
/
wx
/
text_panel.cc
diff --git
a/src/wx/text_panel.cc
b/src/wx/text_panel.cc
index fa039dbde111f50111993a26de2232eca814b001..2fdcbb51f5d03733abdbce3d9950d5c1ad089acd 100644
(file)
--- a/
src/wx/text_panel.cc
+++ b/
src/wx/text_panel.cc
@@
-886,9
+886,10
@@
TextPanel::clear_outline_subtitles ()
void
TextPanel::analysis_finished ()
{
void
TextPanel::analysis_finished ()
{
+ _loading_analysis = false;
+
auto content = _analysis_content.lock ();
if (!content) {
auto content = _analysis_content.lock ();
if (!content) {
- _loading_analysis = false;
setup_sensitivity ();
return;
}
setup_sensitivity ();
return;
}
@@
-899,12
+900,10
@@
TextPanel::analysis_finished ()
*/
error_dialog (_parent->window(), _("Could not analyse subtitles."));
clear_outline_subtitles ();
*/
error_dialog (_parent->window(), _("Could not analyse subtitles."));
clear_outline_subtitles ();
- _loading_analysis = false;
setup_sensitivity ();
return;
}
setup_sensitivity ();
return;
}
- _loading_analysis = false;
try_to_load_analysis ();
}
try_to_load_analysis ();
}