diff options
| author |  k0st1x | 2015-07-30 23:03:35 +0300 |
|---|---|---|
| committer | k0st1x | 2015-07-30 23:03:35 +0300 |
| commit | 73443e2fd916747e9d6c0bc5b0365e50813207e0 (patch) | |
| tree | 4aaca4f07fd03aeb5306b30277b213f3b40178c6 /Juick/ViewModels | |
| parent | f886241fdf48e1c1880084ae2f4bd0541f5cf3c0 (diff) | |
| parent | bad1ba044c60afcf20643883878f2103d9db9744 (diff) | |
Merge branch 'master' of https://bitbucket.org/vitalyster/juick-windowsphone
Conflicts:
Juick/Properties/WMAppManifest.xml
Diffstat (limited to 'Juick/ViewModels')
| -rw-r--r-- | Juick/ViewModels/LoginViewModel.cs | 2 | ||||
| -rw-r--r-- | Juick/ViewModels/PageViewModel.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Juick/ViewModels/LoginViewModel.cs b/Juick/ViewModels/LoginViewModel.cs index 9589f08..f6f50ec 100644 --- a/Juick/ViewModels/LoginViewModel.cs +++ b/Juick/ViewModels/LoginViewModel.cs @@ -60,7 +60,7 @@ namespace Juick.ViewModels App.AppContext.Account.Password = Password; App.AppContext.Account.IsAuthenticated = true; App.AppContext.EnableNotifications(); - ((App)Application.Current).NavigateTo(NextUri, true); + ((App)Application.Current).NavigateTo(NextUri); } else if (response.StatusCode == HttpStatusCode.Forbidden) diff --git a/Juick/ViewModels/PageViewModel.cs b/Juick/ViewModels/PageViewModel.cs index c13e6f1..152e9d9 100644 --- a/Juick/ViewModels/PageViewModel.cs +++ b/Juick/ViewModels/PageViewModel.cs @@ -73,7 +73,7 @@ namespace Juick.ViewModels _context.Client.ExecuteAsync<List<Message>>(request, response =>
{
_context.IsDataLoading = false;
- if (response.ErrorException != null)
+ if (response == null || response.ErrorException != null)
{
return;
}
|