mirror of
https://github.com/yann64/haikuports.git
synced 2026-05-06 06:58:57 +02:00
55 lines
1.5 KiB
Plaintext
55 lines
1.5 KiB
Plaintext
From 511a4d187403a580dbe2cd46881a51d9d9fcc61c Mon Sep 17 00:00:00 2001
|
|
From: Sergei Reznikov <diver@gelios.net>
|
|
Date: Tue, 2 Oct 2018 15:12:39 +0300
|
|
Subject: Workaround for a crash on quit
|
|
|
|
|
|
diff --git a/src/application/logfile.cpp b/src/application/logfile.cpp
|
|
index 04c9c13..03711b7 100644
|
|
--- a/src/application/logfile.cpp
|
|
+++ b/src/application/logfile.cpp
|
|
@@ -36,7 +36,8 @@ void LogFile::msgHandler(QtMsgType type, const QMessageLogContext &, const QStri
|
|
if (!mainApp->dataDirInitialized())
|
|
return;
|
|
|
|
- QFile file;
|
|
+}
|
|
+/* QFile file;
|
|
file.setFileName(mainApp->dataDir() + "/debug.log");
|
|
QIODevice::OpenMode openMode = QIODevice::WriteOnly | QIODevice::Text;
|
|
|
|
@@ -74,6 +75,7 @@ void LogFile::msgHandler(QtMsgType type, const QMessageLogContext &, const QStri
|
|
file.close();
|
|
}
|
|
}
|
|
+*/
|
|
#else
|
|
void LogFile::msgHandler(QtMsgType type, const char *msg)
|
|
{
|
|
--
|
|
2.23.0
|
|
|
|
|
|
From 388e20b88c3288f315615703a126ac5c5677bcf4 Mon Sep 17 00:00:00 2001
|
|
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
|
Date: Mon, 21 Oct 2019 20:13:39 +1000
|
|
Subject: Fix resource dir
|
|
|
|
|
|
diff --git a/src/application/mainapplication.cpp b/src/application/mainapplication.cpp
|
|
index 20ad98a..033aeed 100644
|
|
--- a/src/application/mainapplication.cpp
|
|
+++ b/src/application/mainapplication.cpp
|
|
@@ -173,7 +173,7 @@ void MainApplication::checkPortable()
|
|
|
|
void MainApplication::checkDir()
|
|
{
|
|
-#if defined(Q_OS_WIN) || defined(Q_OS_OS2)
|
|
+#if defined(Q_OS_WIN) || defined(Q_OS_OS2) || defined(Q_OS_HAIKU)
|
|
resourcesDir_ = QCoreApplication::applicationDirPath();
|
|
#else
|
|
#if defined(Q_OS_MAC)
|
|
--
|
|
2.23.0
|
|
|