commit 76d59690cf71a0c6fcc8cd91fcaa860735582161
author Alexandre Lision <alexandre.lision@savoirfairelinux.com> Wed Jan 20 18:06:05 2016 -0500
committer Alexandre Lision <alexandre.lision@savoirfairelinux.com> Thu Jan 21 14:04:28 2016 -0500
tree a127cc5ddbedc8de4b60319b950bcec772b8da17
parent c0657f46bb5d805ea0640e6ba49336c005598270

wizard: fix wizard cancellation

wrong redirection to main window if user do not create his account

Tuleap: #255
Change-Id: Ib984525610ede06084c2625de819b3112604dfde

src/AppDelegate.mm

diff --git a/src/AppDelegate.mm b/src/AppDelegate.mm
index 111de1c..2c469a1 100644
--- a/src/AppDelegate.mm
+++ b/src/AppDelegate.mm
@@ -140,7 +140,7 @@
     if(self.wizard == nil) {
         self.wizard = [[RingWizardWC alloc] initWithWindowNibName:@"RingWizard"];
     }
-    [self.wizard.window orderFront:self];
+    [self.wizard.window makeKeyAndOrderFront:self];
 }
 
 - (void) showMainWindow
@@ -148,9 +148,6 @@
     if(self.ringWindowController == nil) {
         self.ringWindowController = [[RingWindowController alloc] initWithWindowNibName:@"RingWindow"];
     }
-
-    self.wizard = nil;
-
     [self.ringWindowController.window makeKeyAndOrderFront:self];
 }
 
@@ -160,7 +157,7 @@
     for (int i = 0 ; i < AccountModel::instance().rowCount() ; ++i) {
         QModelIndex idx = AccountModel::instance().index(i);
         Account* acc = AccountModel::instance().getAccountByModelIndex(idx);
-        if(acc->protocol() == Account::Protocol::RING) {
+        if(acc->protocol() == Account::Protocol::RING && !acc->isNew()) {
             if (acc->displayName().isEmpty())
                 acc->setDisplayName(acc->alias());
             foundRingAcc = YES;
@@ -222,20 +219,25 @@
 
 - (void)handleQuitEvent:(NSAppleEventDescriptor*)event withReplyEvent:(NSAppleEventDescriptor*)replyEvent
 {
-    delete CallModel::instance().QObject::parent();
-    [[NSApplication sharedApplication] terminate:self];
+    [self cleanExit];
 }
 
 -(void)applicationWillTerminate:(NSNotification *)notification
 {
+    [self cleanExit];
+}
+
+- (void) cleanExit
+{
+    [self.wizard close];
+    [self.ringWindowController close];
     delete CallModel::instance().QObject::parent();
     [[NSApplication sharedApplication] terminate:self];
 }
 
 #if ENABLE_SPARKLE
 
-#pragma mark -
-#pragma mark Sparkle delegate
+#pragma mark - Sparkle delegate
 
 - (void)updater:(SUUpdater *)updater willInstallUpdate:(SUAppcastItem *)update
 {