From cdba3640a0e532bfefe7224a134dcdb8d331597b Mon Sep 17 00:00:00 2001
From: fieldOfView <aldo@fieldofview.com>
Date: Mon, 26 Sep 2016 16:10:57 +0200
Subject: [PATCH] Move showing eject success message until after the safe to
 remove message is hidden

CURA-2341
---
 .../RemovableDriveOutputDevice.py                          | 7 ++++++-
 plugins/RemovableDriveOutputDevice/RemovableDrivePlugin.py | 5 -----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py b/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py
index f9dd0db85c..efb7929327 100644
--- a/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py
+++ b/plugins/RemovableDriveOutputDevice/RemovableDriveOutputDevice.py
@@ -113,4 +113,9 @@ class RemovableDriveOutputDevice(OutputDevice):
     def _onActionTriggered(self, message, action):
         if action == "eject":
             if Application.getInstance().getOutputDeviceManager().getOutputDevicePlugin("RemovableDriveOutputDevice").ejectDevice(self):
-                message.hide()
\ No newline at end of file
+                message.hide()
+
+                eject_message = Message(catalog.i18nc("@info:status", "Ejected {0}. You can now safely remove the drive.").format(self.getName()))
+            else:
+                eject_message = Message(catalog.i18nc("@info:status", "Failed to eject {0}. Another program may be using the drive.").format(self.getName()))
+            eject_message.show()
diff --git a/plugins/RemovableDriveOutputDevice/RemovableDrivePlugin.py b/plugins/RemovableDriveOutputDevice/RemovableDrivePlugin.py
index 90adac73b1..2fbd554849 100644
--- a/plugins/RemovableDriveOutputDevice/RemovableDrivePlugin.py
+++ b/plugins/RemovableDriveOutputDevice/RemovableDrivePlugin.py
@@ -46,11 +46,6 @@ class RemovableDrivePlugin(OutputDevicePlugin):
 
         if result:
             Logger.log("i", "Succesfully ejected the device")
-            message = Message(catalog.i18nc("@info:status", "Ejected {0}. You can now safely remove the drive.").format(device.getName()))
-            message.show()
-        else:
-            message = Message(catalog.i18nc("@info:status", "Failed to eject {0}. Another program may be using the drive.").format(device.getName()))
-            message.show()
         return result
 
     def performEjectDevice(self, device):