Stub's gui::Gui::get() now asserts enabled() and address some fallout.

Signed-off-by: Ted Hong <[email protected]>

Author: hongted

src/gpl/src/graphicsImpl.cpp

@@ -27,7 +27,9 @@ namespace gpl {
 GraphicsImpl::GraphicsImpl(utl::Logger* logger)
     : HeatMapDataSource(logger, "gpl", "gpl"), logger_(logger), mode_(Mbff)
 {
-  gui::Gui::get()->registerRenderer(this);
+  if (gui::Gui::enabled()) {
+    gui::Gui::get()->registerRenderer(this);
+  }
 }
 
 GraphicsImpl::~GraphicsImpl() = default;

src/gui/BUILD

@@ -30,6 +30,7 @@ cc_library(
     deps = [
         "//src/odb",
         "@boost.multi_array",
+        "@com_google_absl//absl/log:check",
         "@tk_tcl//:tcl",
     ],
 )

src/gui/src/gui.cpp

@@ -210,8 +210,9 @@ static void resetConversions()
 
 Gui* Gui::get()
 {
-  static Gui* singleton_ = new Gui();
-  return singleton_;
+  static Gui* singleton = new Gui();
+
+  return singleton;
 }
 
 Gui::Gui()

src/gui/src/stub.cpp

@@ -12,6 +12,7 @@
 #include <typeinfo>
 #include <vector>
 
+#include "absl/log/check.h"
 #include "gui/gui.h"
 #include "odb/db.h"
 #include "odb/geom.h"
@@ -52,8 +53,10 @@ Gui::Gui() : continue_after_close_(false), logger_(nullptr), db_(nullptr)
 
 Gui* gui::Gui::get()
 {
-  static Gui* singleton_ = new Gui();
-  return singleton_;
+  CHECK(enabled())
+      << "Internal Error: gui::Gui::get() called when enabled() is false";
+
+  return nullptr;
 }
 
 bool gui::Gui::enabled()