From 6896d8d69e7bbf0ea6c4c42b5b08636229d57b11 Mon Sep 17 00:00:00 2001
From: gbronisz <antergos@ant-19.3>
Date: Tue, 19 Mar 2019 19:59:03 +0000
Subject: [PATCH] fix: enable fatal error message

---
 src/pages/check.py  | 22 +++++++++++++---------
 src/show_message.py |  2 ++
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/pages/check.py b/src/pages/check.py
index 9f047e7e8..c04c6df8a 100644
--- a/src/pages/check.py
+++ b/src/pages/check.py
@@ -162,6 +162,16 @@ def go_back(self):
         self.remove_timer = True
         self.proc.terminate()
 
+    def check_partitioning_completion(self):
+        temp = self.settings.get('temp')
+        path = os.path.join(temp, ".cnchi_partitioning_completed")
+        if os.path.exists(path):
+            msg = "You must reboot before retrying again."
+            logging.error(msg)
+            msg = _("You must reboot before retrying again.")
+            show.fatal_error(self.main_window, msg)
+            return False
+
     def prepare(self, direction):
         """ Load screen """
         self.translate_ui()
@@ -169,6 +179,8 @@ def prepare(self, direction):
 
         self.forward_button.set_sensitive(self.results['check_all'])
 
+        self.check_partitioning_completion()
+
         # Set timer
         self.on_timer()
         self.timeout_id = GLib.timeout_add(1000, self.on_timer)
@@ -195,21 +207,13 @@ def run(self):
 
     def check_all(self):
         """ Check that all requirements are meet """
-        temp = self.settings.get('temp')
-        path = os.path.join(temp, ".cnchi_partitioning_completed")
-        if os.path.exists(path):
-            msg = "You must reboot before retrying again."
-            logging.error(msg)
-            msg = _("You must reboot before retrying again.")
-            show.fatal_error(self.main_window, msg)
-            return False
-
         on_power = not self.on_battery()
         self.results['power'] = on_power
 
         space = self.has_enough_space()
         self.results['space'] = space
 
+        temp = self.settings.get('temp')
         path = os.path.join(temp, ".cnchi_partitioning_completed")
         packaging_issues = os.path.exists(path)
         self.results['packing'] = not packaging_issues
diff --git a/src/show_message.py b/src/show_message.py
index 60472943a..65477d603 100644
--- a/src/show_message.py
+++ b/src/show_message.py
@@ -36,6 +36,8 @@
 gi.require_version('Gtk', '3.0')
 from gi.repository import Gtk
 
+from misc import extra as misc
+
 # When testing, no _() is available
 try:
     _("")