From ffe8b41d0137a3b994f0718fa3b029aa22e62dcd Mon Sep 17 00:00:00 2001 From: tildearrow Date: Tue, 4 Apr 2023 16:01:45 -0500 Subject: [PATCH] THIS IS IT --- src/engine/config.cpp | 4 ++-- src/gui/gui.cpp | 16 ++++++++++++---- src/log.cpp | 2 +- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/src/engine/config.cpp b/src/engine/config.cpp index 0adf867fa..2d995b90d 100644 --- a/src/engine/config.cpp +++ b/src/engine/config.cpp @@ -92,10 +92,10 @@ bool DivConfig::loadFromFile(const char* path, bool createOnFail) { logD("config does not exist"); if (createOnFail) { logI("creating default config."); - reportError(fmt::sprintf("Creating default config: %s",strerror(errno)); + reportError(fmt::sprintf("Creating default config: %s",strerror(errno))); return save(path); } else { - reportError(fmt::sprintf("COULD NOT LOAD CONFIG %s",strerror(errno)); + reportError(fmt::sprintf("COULD NOT LOAD CONFIG %s",strerror(errno))); return false; } } diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp index 6213bdfde..53792d952 100644 --- a/src/gui/gui.cpp +++ b/src/gui/gui.cpp @@ -2786,7 +2786,9 @@ void FurnaceGUI::editOptions(bool topMenu) { void FurnaceGUI::toggleMobileUI(bool enable, bool force) { if (mobileUI!=enable || force) { if (!mobileUI && enable) { - ImGui::SaveIniSettingsToDisk(finalLayoutPath); + if (!ImGui::SaveIniSettingsToDisk(finalLayoutPath)) { + reportError(fmt::sprintf("could NOT save layout! %s",strerror(errno))); + } } mobileUI=enable; if (mobileUI) { @@ -2796,7 +2798,9 @@ void FurnaceGUI::toggleMobileUI(bool enable, bool force) { fileDialog->mobileUI=true; } else { ImGui::GetIO().IniFilename=NULL; - ImGui::LoadIniSettingsFromDisk(finalLayoutPath); + if (!ImGui::LoadIniSettingsFromDisk(finalLayoutPath)) { + reportError(fmt::sprintf("could NOT load layout! %s",strerror(errno))); + } ImGui::GetIO().ConfigFlags&=~ImGuiConfigFlags_InertialScrollEnable; ImGui::GetIO().ConfigFlags&=~ImGuiConfigFlags_NoHoverColors; fileDialog->mobileUI=false; @@ -5025,7 +5029,9 @@ bool FurnaceGUI::loop() { ImGui::CloseCurrentPopup(); if (!mobileUI) { ImGui::LoadIniSettingsFromMemory(defaultLayout); - ImGui::SaveIniSettingsToDisk(finalLayoutPath); + if (!ImGui::SaveIniSettingsToDisk(finalLayoutPath)) { + reportError(fmt::sprintf("could NOT save layout! %s",strerror(errno))); + } } } ImGui::SameLine(); @@ -5907,7 +5913,9 @@ bool FurnaceGUI::init() { void FurnaceGUI::commitState() { if (!mobileUI) { - ImGui::SaveIniSettingsToDisk(finalLayoutPath); + if (!ImGui::SaveIniSettingsToDisk(finalLayoutPath)) { + reportError(fmt::sprintf("could NOT save layout! %s",strerror(errno))); + } } e->setConf("configVersion",(int)DIV_ENGINE_VERSION); diff --git a/src/log.cpp b/src/log.cpp index 5f24269d8..536583c44 100644 --- a/src/log.cpp +++ b/src/log.cpp @@ -24,7 +24,7 @@ #ifdef IS_MOBILE int logLevel=LOGLEVEL_TRACE; #else -int logLevel=LOGLEVEL_INFO; +int logLevel=LOGLEVEL_TRACE; // until done #endif FILE* logFile;