From 27ad4bbee80f6657c586c3b9ebb34fc639daa184 Mon Sep 17 00:00:00 2001
From: Yann Diorcet <yann.diorcet@belledonne-communications.com>
Date: Thu, 16 Aug 2012 14:30:04 +0200
Subject: [PATCH] Fix previous commit: Chat/ChatRoom view stack issue

---
 Classes/ContactDetailsImagePickerController.m | 1 +
 Classes/ContactDetailsTableViewController.m   | 4 ++--
 Classes/PhoneMainView.m                       | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Classes/ContactDetailsImagePickerController.m b/Classes/ContactDetailsImagePickerController.m
index 3f321ce45..0b68fcf1b 100644
--- a/Classes/ContactDetailsImagePickerController.m
+++ b/Classes/ContactDetailsImagePickerController.m
@@ -24,6 +24,7 @@
 
 @synthesize imagePickerDelegate;
 
+
 #pragma mark - UICompositeViewDelegate Functions
 
 static UICompositeViewDescription *compositeDescription = nil;
diff --git a/Classes/ContactDetailsTableViewController.m b/Classes/ContactDetailsTableViewController.m
index f0cee1c8d..784efef47 100644
--- a/Classes/ContactDetailsTableViewController.m
+++ b/Classes/ContactDetailsTableViewController.m
@@ -489,8 +489,8 @@ static const int contactSections[ContactSections_MAX] = {ContactSections_None, C
                 }
             } else {
                 // Go to Chat room view
-                [[PhoneMainView instance] popToView:[ChatViewController compositeViewDescription]];
-                ChatRoomViewController *controller = DYNAMIC_CAST([[PhoneMainView instance] changeCurrentView:[ChatRoomViewController compositeViewDescription]], ChatRoomViewController);
+                [[PhoneMainView instance] popToView:[ChatViewController compositeViewDescription]]; // Got to Chat and push ChatRoom
+                ChatRoomViewController *controller = DYNAMIC_CAST([[PhoneMainView instance] changeCurrentView:[ChatRoomViewController compositeViewDescription] push:TRUE], ChatRoomViewController);
                 if(controller != nil) {
                    [controller setRemoteAddress:dest];
                 }
diff --git a/Classes/PhoneMainView.m b/Classes/PhoneMainView.m
index d86226176..390201f3d 100644
--- a/Classes/PhoneMainView.m
+++ b/Classes/PhoneMainView.m
@@ -516,7 +516,7 @@ static PhoneMainView* phoneMainViewInstance=nil;
          
 - (UIViewController*)popCurrentView {
     [LinphoneLogger logc:LinphoneLoggerLog format:"PhoneMainView: Pop view"];
-    if([viewStack count] > 0) {
+    if([viewStack count] > 1) {
         [viewStack removeLastObject];
         [self _changeCurrentView:[viewStack lastObject] transition:[PhoneMainView getBackwardTransition] force:TRUE];
         return [mainViewController getCurrentViewController];