From ffd68fbfb90242069af957f2a28908f0559f8348 Mon Sep 17 00:00:00 2001
From: "Steinar H. Gunderson" <sgunderson@bigfoot.com>
Date: Sun, 22 Apr 2018 15:17:13 +0200
Subject: [PATCH] Fix a crash when trying to load/save files and CEF is active.

---
 input_mapping_dialog.cpp | 16 ++++++++++++++--
 midi_mapping_dialog.cpp  | 16 ++++++++++++++--
 2 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/input_mapping_dialog.cpp b/input_mapping_dialog.cpp
index f303280..9e12c98 100644
--- a/input_mapping_dialog.cpp
+++ b/input_mapping_dialog.cpp
@@ -266,8 +266,14 @@ void InputMappingDialog::updown_clicked(int direction)
 
 void InputMappingDialog::save_clicked()
 {
+#if HAVE_CEF
+	// The native file dialog uses GTK+, which interferes with CEF's use of the GLib main loop.
+	QFileDialog::Option options(QFileDialog::DontUseNativeDialog);
+#else
+	QFileDialog::Option options;
+#endif
 	QString filename = QFileDialog::getSaveFileName(this,
-		"Save input mapping", QString(), tr("Mapping files (*.mapping)"));
+		"Save input mapping", QString(), tr("Mapping files (*.mapping)"), /*selectedFilter=*/nullptr, options);
 	if (!filename.endsWith(".mapping")) {
 		filename += ".mapping";
 	}
@@ -280,8 +286,14 @@ void InputMappingDialog::save_clicked()
 
 void InputMappingDialog::load_clicked()
 {
+#if HAVE_CEF
+	// The native file dialog uses GTK+, which interferes with CEF's use of the GLib main loop.
+	QFileDialog::Option options(QFileDialog::DontUseNativeDialog);
+#else
+	QFileDialog::Option options;
+#endif
 	QString filename = QFileDialog::getOpenFileName(this,
-		"Load input mapping", QString(), tr("Mapping files (*.mapping)"));
+		"Load input mapping", QString(), tr("Mapping files (*.mapping)"), /*selectedFilter=*/nullptr, options);
 	InputMapping new_mapping;
 	if (!load_input_mapping_from_file(devices, filename.toStdString(), &new_mapping)) {
 		QMessageBox box;
diff --git a/midi_mapping_dialog.cpp b/midi_mapping_dialog.cpp
index 4a4ecfb..8965603 100644
--- a/midi_mapping_dialog.cpp
+++ b/midi_mapping_dialog.cpp
@@ -280,9 +280,15 @@ void MIDIMappingDialog::cancel_clicked()
 
 void MIDIMappingDialog::save_clicked()
 {
+#if HAVE_CEF
+	// The native file dialog uses GTK+, which interferes with CEF's use of the GLib main loop.
+	QFileDialog::Option options(QFileDialog::DontUseNativeDialog);
+#else
+	QFileDialog::Option options;
+#endif
 	unique_ptr<MIDIMappingProto> new_mapping = construct_mapping_proto_from_ui();
 	QString filename = QFileDialog::getSaveFileName(this,
-		"Save MIDI mapping", QString(), tr("Mapping files (*.midimapping)"));
+		"Save MIDI mapping", QString(), tr("Mapping files (*.midimapping)"), /*selectedFilter=*/nullptr, options);
 	if (!filename.endsWith(".midimapping")) {
 		filename += ".midimapping";
 	}
@@ -295,8 +301,14 @@ void MIDIMappingDialog::save_clicked()
 
 void MIDIMappingDialog::load_clicked()
 {
+#if HAVE_CEF
+	// The native file dialog uses GTK+, which interferes with CEF's use of the GLib main loop.
+	QFileDialog::Option options(QFileDialog::DontUseNativeDialog);
+#else
+	QFileDialog::Option options;
+#endif
 	QString filename = QFileDialog::getOpenFileName(this,
-		"Load MIDI mapping", QString(), tr("Mapping files (*.midimapping)"));
+		"Load MIDI mapping", QString(), tr("Mapping files (*.midimapping)"), /*selectedFilter=*/nullptr, options);
 	MIDIMappingProto new_mapping;
 	if (!load_midi_mapping_from_file(filename.toStdString(), &new_mapping)) {
 		QMessageBox box;
-- 
2.39.2