diff options
| author | Hyerim Kim <rimi.kim@samsung.com> | 2017-08-02 00:53:48 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal> | 2017-08-02 00:53:48 +0000 |
| commit | 67c873f79756a2aad479f186008881c0f8ab2e70 (patch) | |
| tree | f957d1a711632da24b10267ba1645136f9635676 | |
| parent | e6f39aabcc61cb45772d2ad0bd675d71e170f943 (diff) | |
| parent | e1f64ec39c5e0028fd14e87303a789135d399d0a (diff) | |
| download | home-67c873f79756a2aad479f186008881c0f8ab2e70.tar.gz home-67c873f79756a2aad479f186008881c0f8ab2e70.tar.bz2 home-67c873f79756a2aad479f186008881c0f8ab2e70.zip | |
Merge "Modifies Svace issues" into tizen
| -rwxr-xr-x | LibTVRefCommonPortable/Utils/RecentShortcutStorage.cs | 6 | ||||
| -rwxr-xr-x | TVApps/TVApps/TVApps.cs | 2 | ||||
| -rwxr-xr-x | TVHome/TVHome/TVHome.cs | 2 | ||||
| -rwxr-xr-x | TVHome/TVHome/Views/MainPage.xaml.cs | 6 |
4 files changed, 8 insertions, 8 deletions
diff --git a/LibTVRefCommonPortable/Utils/RecentShortcutStorage.cs b/LibTVRefCommonPortable/Utils/RecentShortcutStorage.cs index 828e007..6d9dedd 100755 --- a/LibTVRefCommonPortable/Utils/RecentShortcutStorage.cs +++ b/LibTVRefCommonPortable/Utils/RecentShortcutStorage.cs @@ -128,9 +128,9 @@ namespace LibTVRefCommonPortable.Utils }; var mediaControlAction = defaultStateDescription.Action as MediaControlAction; - mediaControlAction.ExtraData.Add("View By", "All"); - mediaControlAction.ExtraData.Add("Media type", "Video"); - mediaControlAction.ExtraData.Add("Media Id", item.MediaId); + mediaControlAction?.ExtraData.Add("View By", "All"); + mediaControlAction?.ExtraData.Add("Media type", "Video"); + mediaControlAction?.ExtraData.Add("Media Id", item.MediaId); var recentShortcutInfo = new RecentShortcutInfo(); diff --git a/TVApps/TVApps/TVApps.cs b/TVApps/TVApps/TVApps.cs index 66230a7..589e5c3 100755 --- a/TVApps/TVApps/TVApps.cs +++ b/TVApps/TVApps/TVApps.cs @@ -74,7 +74,7 @@ namespace TVApps try { string modelName; - if (DependencyService.Get<ISystemSettings>().GetSystemModelName(out modelName)) + if (DependencyService.Get<ISystemSettings>() != null && DependencyService.Get<ISystemSettings>().GetSystemModelName(out modelName)) { SizeUtils.SetModelName(modelName); } diff --git a/TVHome/TVHome/TVHome.cs b/TVHome/TVHome/TVHome.cs index 642d83e..8afe1a1 100755 --- a/TVHome/TVHome/TVHome.cs +++ b/TVHome/TVHome/TVHome.cs @@ -92,7 +92,7 @@ namespace TVHome try { string modelName; - if (DependencyService.Get<ISystemSettings>().GetSystemModelName(out modelName)) + if (DependencyService.Get<ISystemSettings>() != null && DependencyService.Get<ISystemSettings>().GetSystemModelName(out modelName)) { SizeUtils.SetModelName(modelName); } diff --git a/TVHome/TVHome/Views/MainPage.xaml.cs b/TVHome/TVHome/Views/MainPage.xaml.cs index c67c9b6..c65faae 100755 --- a/TVHome/TVHome/Views/MainPage.xaml.cs +++ b/TVHome/TVHome/Views/MainPage.xaml.cs @@ -75,7 +75,7 @@ namespace TVHome.Views PageMainPanel.TranslateTo(0.0, 0.0, 150); #pragma warning restore CS4014 await PageMainPanel.ScaleTo(0.0, 150); - DependencyService.Get<IWindowAPIs>().SetIconified(true); + DependencyService.Get<IWindowAPIs>()?.SetIconified(true); } /// <summary> @@ -90,7 +90,7 @@ namespace TVHome.Views PageMainPanel.TranslateTo(0.0, 0.0, 150); #pragma warning restore CS4014 await PageMainPanel.ScaleTo(1.0, 150); - DependencyService.Get<IWindowAPIs>().SetIconified(false); + DependencyService.Get<IWindowAPIs>()?.SetIconified(false); } /// <summary> @@ -98,7 +98,7 @@ namespace TVHome.Views /// </summary> private void ToggleIconified() { - if (DependencyService.Get<IWindowAPIs>().GetIconified() == true) + if (DependencyService.Get<IWindowAPIs>()?.GetIconified() == true) { PageMainPanel.InitialFocusing(); Uniconified(); |