projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix memory leak which also causes strange flickering in the audio
[dcpomatic.git]
/
src
/
wx
/
kdm_output_panel.cc
diff --git
a/src/wx/kdm_output_panel.cc
b/src/wx/kdm_output_panel.cc
index a345d0e963b62ed37dc6acde857f80998f11bd87..b138e7d31574b828f580a06548f44c12ddb03482 100644
(file)
--- a/
src/wx/kdm_output_panel.cc
+++ b/
src/wx/kdm_output_panel.cc
@@
-18,9
+18,6
@@
*/
*/
-#include "lib/config.h"
-#include "lib/cinema.h"
-#include "lib/send_kdm_email_job.h"
#include "kdm_output_panel.h"
#include "kdm_timing_panel.h"
#include "confirm_kdm_email_dialog.h"
#include "kdm_output_panel.h"
#include "kdm_timing_panel.h"
#include "confirm_kdm_email_dialog.h"
@@
-29,14
+26,22
@@
#include "name_format_editor.h"
#include "check_box.h"
#include "dcpomatic_button.h"
#include "name_format_editor.h"
#include "check_box.h"
#include "dcpomatic_button.h"
+#include "lib/config.h"
+#include "lib/cinema.h"
+#include "lib/send_kdm_email_job.h"
+#include "lib/warnings.h"
#include <dcp/exceptions.h>
#include <dcp/types.h>
#ifdef DCPOMATIC_USE_OWN_PICKER
#include "dir_picker_ctrl.h"
#else
#include <dcp/exceptions.h>
#include <dcp/types.h>
#ifdef DCPOMATIC_USE_OWN_PICKER
#include "dir_picker_ctrl.h"
#else
+DCPOMATIC_DISABLE_WARNINGS
#include <wx/filepicker.h>
#include <wx/filepicker.h>
+DCPOMATIC_ENABLE_WARNINGS
#endif
#endif
+DCPOMATIC_DISABLE_WARNINGS
#include <wx/stdpaths.h>
#include <wx/stdpaths.h>
+DCPOMATIC_ENABLE_WARNINGS
using std::pair;
using std::string;
using std::pair;
using std::string;