simplifications

no point in calling `owns_lock` twice
DFHack · Dec 18, 2024 · 0f326c1 · 0f326c1
1 parent ff6d7a2
commit 0f326c1
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/library/include/Core.h b/library/include/Core.h
@@ -397,7 +397,7 @@ namespace DFHack
         }
 
         ~CoreSuspenderBase() {
-            if (owns_lock()) unlock();
+            unlock();
         }
 
     protected:
@@ -448,13 +448,14 @@ namespace DFHack
             lock();
         }
 
+        // note that this is needed so the destructor will call CoreSuspender::unlock instead of CoreSuspenderBase::unlock
         ~CoreSuspender() {
-            if (owns_lock()) unlock();
+            unlock();
         }
 
     protected:
         // deferred locking is not part of CoreSuspender's public API
-        // these constructors are onmly for use in derived classes,
+        // these constructors are only for use in derived classes,
         // specifically ConditionalCoreSuspender
         CoreSuspender(std::defer_lock_t d) : CoreSuspender{ Core::getInstance(),d } {}
         CoreSuspender(Core& core, std::defer_lock_t d) : CoreSuspenderBase{ core } {}