Merge branch 'master' of https://bitbucket.org/vitalyster/juick-windowsphone

Conflicts:
	Juick/Properties/WMAppManifest.xml

1 files changed, 7 insertions, 7 deletions

diff --git a/Juick/App.xaml.cs b/Juick/App.xaml.cs
index bb8dddb..100f0e3 100644
--- a/Juick/App.xaml.cs
+++ b/Juick/App.xaml.cs
@@ -10,15 +10,15 @@ namespace Juick
 {

     public partial class App : Application

     {

-        public void NavigateTo(Uri param, bool removeFromStack = false)

+        public void NavigateTo(Uri param)

         {

-            var page = (PhoneApplicationPage) RootFrame.Content;

+            var page = (PhoneApplicationPage)RootFrame.Content;

             var service = page.NavigationService;

-            service.Navigate(param);

-            if (removeFromStack)

+            page.Dispatcher.BeginInvoke(() =>

             {

-                page.Dispatcher.BeginInvoke(() => service.RemoveBackEntry());

-            }

+                service.Navigate(param);                

+            });            

+            

         }

         private static AppViewModel _context = null;

 

@@ -230,7 +230,7 @@ namespace Juick
                     // The app was relaunched via a Deep Link.

                     // The page stack will be cleared.

                 }

-                else if (e.Uri.OriginalString.Contains("/MainPage.xaml"))

+                else if (e.Uri.OriginalString.Contains("/LaunchPage.xaml"))

                 {

                     // This block will run if the navigation Uri is the main page

                     if (_sessionType == SessionType.DeepLink)