mirror of
https://github.com/yann64/haikuports.git
synced 2026-05-05 22:48:55 +02:00
75 lines
2.0 KiB
Plaintext
75 lines
2.0 KiB
Plaintext
From 236793f86c7e4dadd9c135fcde7aa2e645b8284f Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
|
|
Date: Fri, 16 Mar 2018 20:43:08 +0100
|
|
Subject: Haiku warning fix
|
|
|
|
|
|
diff --git a/src/core/Application.cpp b/src/core/Application.cpp
|
|
index 66146b6..ee55e1a 100644
|
|
--- a/src/core/Application.cpp
|
|
+++ b/src/core/Application.cpp
|
|
@@ -346,7 +346,9 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv), Act
|
|
}
|
|
else
|
|
{
|
|
- message = tr("Your profile directory (%1) is running low on free disk space (%2 remaining).\nThis may lead to malfunctions or even data loss.").arg(QDir::toNativeSeparators(profilePath)).arg(Utils::formatUnit(storageInformation.bytesAvailable()));
|
|
+ #ifndef __HAIKU__
|
|
+ message = tr("Your profile directory (%1) is running low on free disk space (%2 remaining).\nThis may lead to malfunctions or even data loss.").arg(QDir::toNativeSeparators(profilePath)).arg(Utils::formatUnit(storageInformation.bytesAvailable()));
|
|
+ #endif
|
|
}
|
|
|
|
QMessageBox messageBox;
|
|
--
|
|
2.16.2
|
|
|
|
|
|
From ead59941352dcfe9869577c539a9d46cd1caa6a1 Mon Sep 17 00:00:00 2001
|
|
From: Gerasim Troeglazov <3dEyes@gmail.com>
|
|
Date: Sat, 5 May 2018 18:06:16 +1000
|
|
Subject: Fix crash when exit
|
|
|
|
|
|
diff --git a/src/core/Application.cpp b/src/core/Application.cpp
|
|
index ee55e1a..d284666 100644
|
|
--- a/src/core/Application.cpp
|
|
+++ b/src/core/Application.cpp
|
|
@@ -366,7 +366,7 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv), Act
|
|
|
|
if (messageBox.clickedButton() == quitButton)
|
|
{
|
|
- exit();
|
|
+ ::exit(0);
|
|
|
|
return;
|
|
}
|
|
@@ -397,7 +397,7 @@ Application::Application(int &argc, char **argv) : QApplication(argc, argv), Act
|
|
m_localServer->close();
|
|
}
|
|
|
|
- exit();
|
|
+ ::exit(0);
|
|
|
|
return;
|
|
}
|
|
@@ -848,7 +848,7 @@ void Application::close()
|
|
{
|
|
SessionsManager::saveSession();
|
|
|
|
- exit();
|
|
+ ::exit(0);
|
|
}
|
|
}
|
|
|
|
@@ -870,7 +870,7 @@ void Application::removeWindow(MainWindow *mainWindow)
|
|
|
|
if (m_windows.isEmpty())
|
|
{
|
|
- exit();
|
|
+ ::exit(0);
|
|
}
|
|
}
|
|
|
|
--
|
|
2.16.2
|
|
|