Correct return result of API functions when text encoding is set to Unicode.

Use QPointer to store pointer to dialogs to avoid crashes.
(However crashes related to dbus are still not resolved.)

2 files changed, 12 insertions, 7 deletions

diff --git a/qmidiplayer-desktop/qmpmainwindow.cpp b/qmidiplayer-desktop/qmpmainwindow.cpp
index 73724ec..633489c 100644
--- a/qmidiplayer-desktop/qmpmainwindow.cpp
+++ b/qmidiplayer-desktop/qmpmainwindow.cpp
@@ -308,6 +308,8 @@ QString qmpMainWindow::getFileName(){return ui->lbFileName->text();}
 std::string qmpMainWindow::getTitle()
 {
 	if(!qmpSettingsWindow::getSettingsIntf())return "";
+	if(qmpSettingsWindow::getSettingsIntf()->value("Midi/TextEncoding","").toString()
+		=="Unicode")return std::string(player->getTitle());
 	return QTextCodec::codecForName(
 				qmpSettingsWindow::getSettingsIntf()->value("Midi/TextEncoding","").
 				toString().toStdString().c_str())->
@@ -316,6 +318,8 @@ std::string qmpMainWindow::getTitle()
 std::wstring qmpMainWindow::getWTitle()
 {
 	if(!qmpSettingsWindow::getSettingsIntf())return L"";
+	if(qmpSettingsWindow::getSettingsIntf()->value("Midi/TextEncoding","").toString()
+		=="Unicode")return QString(player->getTitle()).toStdWString();
 	return QTextCodec::codecForName(
 				qmpSettingsWindow::getSettingsIntf()->value("Midi/TextEncoding","").
 				toString().toStdString().c_str())->
diff --git a/qmidiplayer-desktop/qmpmainwindow.hpp b/qmidiplayer-desktop/qmpmainwindow.hpp
index ef07798..73bd109 100644
--- a/qmidiplayer-desktop/qmpmainwindow.hpp
+++ b/qmidiplayer-desktop/qmpmainwindow.hpp
@@ -10,8 +10,9 @@
 #include <QMouseEvent>
 #include <QAction>
 #include <QMenu>
-#include <QApplication>
 #include <QSlider>
+#include <QPointer>
+#include <QApplication>
 #include <thread>
 #include <chrono>
 #include "../core/qmpmidiplay.hpp"
@@ -106,12 +107,12 @@ class qmpMainWindow:public QMainWindow
 		double offset;
 		CMidiPlayer *player;
 		qmpPluginManager *pmgr;
-		qmpPlistWindow *plistw;
-		qmpChannelsWindow *chnlw;
-		qmpEfxWindow *efxw;
-		qmpInfoWindow *infow;
-		qmpSettingsWindow *settingsw;
-		qmpHelpWindow *helpw;
+		QPointer<qmpPlistWindow> plistw;
+		QPointer<qmpChannelsWindow> chnlw;
+		QPointer<qmpEfxWindow> efxw;
+		QPointer<qmpInfoWindow> infow;
+		QPointer<qmpSettingsWindow> settingsw;
+		QPointer<qmpHelpWindow> helpw;
 		qmpVisualizationIntf* VIs[16];
 
 		QAction *fnA1,*fnA2,*fnA3;