diff options
| author | Willem Jan Palenstijn | 2013-09-24 13:55:54 +0200 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2013-09-24 13:55:54 +0200 |
| commit | 6417192584873f98737a0928adefeb9aa9cad894 (patch) | |
| tree | 0d238f05c406ae70fff8c907bd10d29a16f2d6a4 /backends/platform/tizen/system.cpp | |
| parent | f3514534ce46bad5e3ffadfdf0b3af403045e5ef (diff) | |
| parent | 74cc4aec8aa80da2541857e3120b31a566ccdff3 (diff) | |
| download | scummvm-rg350-6417192584873f98737a0928adefeb9aa9cad894.tar.gz scummvm-rg350-6417192584873f98737a0928adefeb9aa9cad894.tar.bz2 scummvm-rg350-6417192584873f98737a0928adefeb9aa9cad894.zip | |
Merge branch 'master' into zvision
Conflicts:
video/avi_decoder.cpp
Diffstat (limited to 'backends/platform/tizen/system.cpp')
| -rw-r--r-- | backends/platform/tizen/system.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/backends/platform/tizen/system.cpp b/backends/platform/tizen/system.cpp index 54d92146e5..3448dc1421 100644 --- a/backends/platform/tizen/system.cpp +++ b/backends/platform/tizen/system.cpp @@ -513,13 +513,15 @@ TizenAppForm *systemStart(Tizen::App::Application *app) { } if (E_SUCCESS != appForm->Construct() || - E_SUCCESS != appFrame->AddControl(*appForm)) { + E_SUCCESS != appFrame->AddControl(appForm)) { delete appForm; AppLog("Failed to construct appForm"); return NULL; } appFrame->SetCurrentForm(appForm); + appForm->GetVisualElement()->SetShowState(false); + logLeaving(); return appForm; } @@ -531,7 +533,7 @@ void systemError(const char *message) { AppLog("Fatal system error: %s", message); if (strspn(message, "Config file buggy:") > 0) { - Tizen::Io::File::Remove(DEFAULT_CONFIG_FILE); + Tizen::Io::File::Remove(App::GetInstance()->GetAppDataPath() + DEFAULT_CONFIG_FILE); Application::GetInstance()->SendUserEvent(USER_MESSAGE_EXIT_ERR_CONFIG, NULL); } else { ArrayList *args = new ArrayList(); |