diff --git a/src/cli/ProgressMeter.cpp b/src/cli/ProgressMeter.cpp index f7adb629..8567c50d 100644 --- a/src/cli/ProgressMeter.cpp +++ b/src/cli/ProgressMeter.cpp @@ -10,7 +10,7 @@ ProgressMeter::ProgressMeter() { hide = false; - simpleMode = false; + simpleMode = true; progress_total = progress = 0; progress_title = ""; } @@ -20,7 +20,7 @@ void ProgressMeter::update(const std::string & newTitle, int totalProgressTicks) progress_title = newTitle; progress = 0; progress_total = totalProgressTicks; - if (simpleMode && !hide) + if (simpleMode && !hide && !newTitle.empty()) { print_log(newTitle + "\n"); } diff --git a/src/editor/Renderer.cpp b/src/editor/Renderer.cpp index c7ac5fec..e8b6e970 100644 --- a/src/editor/Renderer.cpp +++ b/src/editor/Renderer.cpp @@ -334,8 +334,6 @@ Renderer::Renderer() gui->init(); - g_progress.simpleMode = true; - pointEntRenderer = new PointEntRenderer(NULL); reloading = true; diff --git a/src/main.cpp b/src/main.cpp index e56cadad..7d42a8a9 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1053,6 +1053,8 @@ int main(int argc, char* argv[]) g_verbose = true; } + g_progress.simpleMode = false; + if (cli.command == "exportobj") { int scale = 1; diff --git a/src/util/util.cpp b/src/util/util.cpp index 3ac93234..eacafbaf 100644 --- a/src/util/util.cpp +++ b/src/util/util.cpp @@ -27,7 +27,7 @@ #include bool DebugKeyPressed = false; -ProgressMeter g_progress; +ProgressMeter g_progress = {}; int g_render_flags; std::vector g_log_buffer; std::vector g_color_buffer;