Merge branch 'master' into 'master'

Fix Qt5 backend crashing when running in Qt application

See merge request GNOME/libmediaart!2

1 files changed, 4 insertions, 0 deletions

diff --git a/libmediaart/extractqt.cpp b/libmediaart/extractqt.cpp
index 6114270..580f3dd 100644
--- a/libmediaart/extractqt.cpp
+++ b/libmediaart/extractqt.cpp
@@ -59,6 +59,10 @@ media_art_plugin_init (gint max_width)
 	max_width_in_bytes = max_width;
 
 #ifdef HAVE_QT5
+	if (QCoreApplication::instance()) {
+		// avoid a new instance if already running inside a qt app
+		return;
+	}
 	app = new QCoreApplication (argc, argv);
 #else  /* HAVE_QT4 (we fallback to Qt4) */
  	app = new QApplication (argc, argv, QApplication::Tty);