Fix progress bad reset!

UnrealKaraulov · Jan 26, 2024 · c0820f4 · c0820f4
1 parent 83e3818
commit c0820f4
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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
@@ -27,7 +27,7 @@
 #include <unordered_set>
 
 bool DebugKeyPressed = false;
-ProgressMeter g_progress;
+ProgressMeter g_progress = {};
 int g_render_flags;
 std::vector<std::string> g_log_buffer;
 std::vector<unsigned short> g_color_buffer;