diff options
| author | App Bureauet <abm@appbureauet.dk> | 2017-04-06 23:11:05 +0200 |
|---|---|---|
| committer | Rui Marinho <me@ruimarinho.net> | 2017-04-06 22:11:05 +0100 |
| commit | eb3db860e47da2974bddf6f0f959799f12e962c5 (patch) | |
| tree | 412da909dc887883e280d9a19fce06afd4851031 /Xamarin.Forms.Platform.Android | |
| parent | 9c57db04e40aaf026e2f2a58536c4f4a10c25566 (diff) | |
| download | xamarin-forms-eb3db860e47da2974bddf6f0f959799f12e962c5.tar.gz xamarin-forms-eb3db860e47da2974bddf6f0f959799f12e962c5.tar.bz2 xamarin-forms-eb3db860e47da2974bddf6f0f959799f12e962c5.zip | |
OnResume assumed that _application had been set (#859)
When OnResume is called it should not expect the _application to be set already.
I have an app where I use one activity for showing a splash screen and then it starts an intent to show the main activity containing the application.
This used to work before 2.3.4.224.
Diffstat (limited to 'Xamarin.Forms.Platform.Android')
| -rw-r--r-- | Xamarin.Forms.Platform.Android/AppCompat/FormsAppCompatActivity.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Xamarin.Forms.Platform.Android/AppCompat/FormsAppCompatActivity.cs b/Xamarin.Forms.Platform.Android/AppCompat/FormsAppCompatActivity.cs index 4ca0eab8..8bba063b 100644 --- a/Xamarin.Forms.Platform.Android/AppCompat/FormsAppCompatActivity.cs +++ b/Xamarin.Forms.Platform.Android/AppCompat/FormsAppCompatActivity.cs @@ -236,7 +236,7 @@ namespace Xamarin.Forms.Platform.Android // counterpart to OnPause base.OnResume(); - if (_application.OnThisPlatform().GetShouldPreserveKeyboardOnResume()) + if (_application != null && _application.OnThisPlatform().GetShouldPreserveKeyboardOnResume()) { if (CurrentFocus != null && (CurrentFocus is EditText || CurrentFocus is TextView || CurrentFocus is SearchView)) { @@ -568,4 +568,4 @@ namespace Xamarin.Forms.Platform.Android #endregion } -}
\ No newline at end of file +} |