From c623f12b2d5e95708a3971e642410c9098f71285 Mon Sep 17 00:00:00 2001
From: Vitaly Takmazov
Date: Sun, 1 Apr 2018 23:03:29 +0300
Subject: fix navigation

---
 Juick/ViewControllers/DiscoverViewController.m | 2 +-
 Juick/ViewControllers/LoginViewController.m    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'Juick/ViewControllers')

diff --git a/Juick/ViewControllers/DiscoverViewController.m b/Juick/ViewControllers/DiscoverViewController.m
index fde23ee..11010ae 100644
--- a/Juick/ViewControllers/DiscoverViewController.m
+++ b/Juick/ViewControllers/DiscoverViewController.m
@@ -75,7 +75,7 @@ AppDelegate *appDelegate;
 }
 - (IBAction)filterAction:(id)sender {
     if (![User isAuthenticated]) {
-        [self performSegueWithIdentifier:@"loginSegue" sender:self];
+        [self.navigationController performSegueWithIdentifier:@"loginSegue" sender:self.navigationController];
         return;
     }
     UIAlertController *filterAlert = [UIAlertController alertControllerWithTitle:nil message:nil preferredStyle:UIAlertControllerStyleActionSheet];
diff --git a/Juick/ViewControllers/LoginViewController.m b/Juick/ViewControllers/LoginViewController.m
index fd3c2b0..917d563 100644
--- a/Juick/ViewControllers/LoginViewController.m
+++ b/Juick/ViewControllers/LoginViewController.m
@@ -52,7 +52,7 @@
     transition.subtype = kCATransitionFromTop;
     
     [self.navigationController.view.layer addAnimation:transition forKey:kCATransition];
-    [self.navigationController popViewControllerAnimated:NO];
+    [self.navigationController dismissViewControllerAnimated:NO completion:nil];
 }
 
 - (void) doneSignIn {
@@ -68,7 +68,7 @@
             transition.subtype = kCATransitionFromTop;
             
             [self.navigationController.view.layer addAnimation:transition forKey:kCATransition];
-            [self.navigationController popToRootViewControllerAnimated:NO];
+            [self.navigationController dismissViewControllerAnimated:NO completion:nil];
         } else {
             [User throwUnableToLogin:self];
         }
-- 
cgit v1.2.3