mirror/SDRPlusPlus
0
0
Fork 0
mirror of https://github.com/AlexandreRouma/SDRPlusPlus.git synced 2025-01-24 00:34:44 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

revert some changes after the review

Browse Source
This commit is contained in:
kistlin 2022-01-17 06:53:14 +01:00
parent 174158233b
commit 81d23967b6
4 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/config.cpp
View File

@ -36,7 +36,7 @@ void ConfigManager::load(json def, bool lock) {
file >> conf; file >> conf;
file.close(); file.close();
} }
catch (const std::exception& e) { catch (std::exception e) {
spdlog::error("Config file '{0}' is corrupted, resetting it", path); spdlog::error("Config file '{0}' is corrupted, resetting it", path);
conf = def; conf = def;
save(false); save(false);

10
core/src/core.cpp
View File

@ -337,7 +337,7 @@ int sdrpp_main(int argc, char* argv[]) {
#else #else
const char* glsl_version = "#version 120"; const char* glsl_version = "#version 120";
GLFWmonitor* monitor = NULL; GLFWmonitor* monitor = NULL;
for (size_t i = 0; i < OPENGL_VERSION_COUNT; i++) { for (int i = 0; i < OPENGL_VERSION_COUNT; i++) {
glsl_version = OPENGL_VERSIONS_GLSL[i]; glsl_version = OPENGL_VERSIONS_GLSL[i];
glfwWindowHint(GLFW_CLIENT_API, OPENGL_VERSIONS_IS_ES[i] ? GLFW_OPENGL_ES_API : GLFW_OPENGL_API); glfwWindowHint(GLFW_CLIENT_API, OPENGL_VERSIONS_IS_ES[i] ? GLFW_OPENGL_ES_API : GLFW_OPENGL_API);
glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, OPENGL_VERSIONS_MAJOR[i]); glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, OPENGL_VERSIONS_MAJOR[i]);
@ -450,12 +450,8 @@ int sdrpp_main(int argc, char* argv[]) {
bandplan::loadColorTable(bandColors); bandplan::loadColorTable(bandColors);
bool _maximized = maximized; bool _maximized = maximized;
int fsWidth = 0; int fsWidth, fsHeight, fsPosX, fsPosY;
int fsHeight = 0; int _winWidth, _winHeight;
int fsPosX = 0;
int fsPosY = 0;
int _winWidth = 0;
int _winHeight = 0;
glfwGetWindowSize(core::window, &_winWidth, &_winHeight); glfwGetWindowSize(core::window, &_winWidth, &_winHeight);
if (fullScreen) { if (fullScreen) {

2
core/src/gui/main_window.cpp
View File

@ -487,7 +487,7 @@ void MainWindow::draw() {
if (gui::menu.draw(firstMenuRender)) { if (gui::menu.draw(firstMenuRender)) {
core::configManager.acquire(); core::configManager.acquire();
json arr = json::array(); json arr = json::array();
for (size_t i = 0; i < gui::menu.order.size(); i++) { for (int i = 0; i < gui::menu.order.size(); i++) {
arr[i]["name"] = gui::menu.order[i].name; arr[i]["name"] = gui::menu.order[i].name;
arr[i]["open"] = gui::menu.order[i].open; arr[i]["open"] = gui::menu.order[i].open;
} }

2
core/src/utils/networking.cpp
View File

@ -288,7 +288,7 @@ namespace net {
} }
entry.handler(std::move(client), entry.ctx); entry.handler(std::move(client), entry.ctx);
} }
catch (const std::exception& e) { catch (std::exception e) {
listening = false; listening = false;
return; return;
} }