Don't hold the CoreSuspend over INTERPOSE_NEXT

warmist · warmist · commit 41a0df50dc1c · 2025-01-01T11:49:00.000+02:00
diff --git a/plugins/building-hacks.cpp b/plugins/building-hacks.cpp
@@ -290,9 +290,11 @@ struct work_hook : df::building_workshopst{
     }
     DEFINE_VMETHOD_INTERPOSE(void, setTriggerState,(int32_t state))
     {
-        CoreSuspendClaimer suspend;
-        color_ostream_proxy out(Core::getInstance().getConsole());
-        onSetTriggerState(out, this,state);
+        {
+            CoreSuspender suspend;
+            color_ostream_proxy out(Core::getInstance().getConsole());
+            onSetTriggerState(out, this, state);
+        }
         INTERPOSE_NEXT(setTriggerState)(state); //pretty sure default workshop has nothing related to this, but to be future proof lets do it like this
     }
     DEFINE_VMETHOD_INTERPOSE(void, drawBuilding, (uint32_t curtick,df::building_drawbuffer *db, int16_t z_offset))

Original file line number	Diff line number	Diff line change
`@@ -290,9 +290,11 @@ struct work_hook : df::building_workshopst{`
`290`	`290`	`}`
`291`	`291`	`DEFINE_VMETHOD_INTERPOSE(void, setTriggerState,(int32_t state))`
`292`	`292`	`{`
`293`		`- CoreSuspendClaimer suspend;`
`294`		`- color_ostream_proxy out(Core::getInstance().getConsole());`
`295`		`- onSetTriggerState(out, this,state);`
	`293`	`+ {`
	`294`	`+ CoreSuspender suspend;`
	`295`	`+ color_ostream_proxy out(Core::getInstance().getConsole());`
	`296`	`+ onSetTriggerState(out, this, state);`
	`297`	`+ }`
`296`	`298`	`INTERPOSE_NEXT(setTriggerState)(state); //pretty sure default workshop has nothing related to this, but to be future proof lets do it like this`
`297`	`299`	`}`
`298`	`300`	`DEFINE_VMETHOD_INTERPOSE(void, drawBuilding, (uint32_t curtick,df::building_drawbuffer *db, int16_t z_offset))`