summarylogtreecommitdiffstats
path: root/0002-disable-unsupported-operating-system-warning.patch
diff options
context:
space:
mode:
Diffstat (limited to '0002-disable-unsupported-operating-system-warning.patch')
-rw-r--r--0002-disable-unsupported-operating-system-warning.patch17
1 files changed, 7 insertions, 10 deletions
diff --git a/0002-disable-unsupported-operating-system-warning.patch b/0002-disable-unsupported-operating-system-warning.patch
index 56aef14132bf..785d65482beb 100644
--- a/0002-disable-unsupported-operating-system-warning.patch
+++ b/0002-disable-unsupported-operating-system-warning.patch
@@ -1,7 +1,7 @@
-From 784599e99ee97574798512f6daf987cab8fd4cdf Mon Sep 17 00:00:00 2001
+From 98a9974f550dfb5c8f66213774e4ef95848127e1 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
-Date: Wed, 8 Feb 2017 09:12:24 +0100
-Subject: [PATCH 1/1] disable unsupported operating system warning
+Date: Mon, 23 Jul 2018 11:04:55 +0200
+Subject: [PATCH 2/4] disable-unsupported-operating-system-warning
Signed-off-by: Christian Hesse <mail@eworm.de>
---
@@ -9,21 +9,18 @@ Signed-off-by: Christian Hesse <mail@eworm.de>
1 file changed, 2 insertions(+)
diff --git a/backend/wbprivate/workbench/wb_context.cpp b/backend/wbprivate/workbench/wb_context.cpp
-index 82c0fa6..f06ff99 100644
+index e80501a..a4047b1 100644
--- a/backend/wbprivate/workbench/wb_context.cpp
+++ b/backend/wbprivate/workbench/wb_context.cpp
-@@ -1009,9 +1009,11 @@ void WBContext::init_finish_(WBOptions *options) {
+@@ -1011,9 +1011,11 @@ void WBContext::init_finish_(WBOptions *options) {
_frontendCallbacks->show_status_text(_("Ready."));
+#if 0
- if (options->open_at_startup_type !=
- "run-script") // <--- so that our runtime tests don't lock up when a modal warning dialog is displayed
+ // Avoid our runtime tests to lock up when a modal warning dialog is displayed.
+ if (options->open_at_startup_type != "run-script")
warnIfRunningOnUnsupportedOS();
+#endif
try {
// execute action requested from command line
---
-2.11.1
-