Partial fix for labels not being drawn while a dialog is open

src/gui/widgets/window.cpp

@@ -315,6 +315,7 @@ window::window(CVideo& video,
 	, invalidate_layout_blocked_(false)
 	, suspend_drawing_(true)
 	, restore_(true)
+	, is_toplevel_(!is_in_dialog())
 	, restorer_()
 	, automatic_placement_(automatic_placement)
 	, horizontal_placement_(horizontal_placement)
@@ -717,7 +718,7 @@ void window::draw()
 
 		// We want the labels underneath the window so draw them and use them
 		// as restore point.
-		if(!is_in_dialog()) {
+		if(is_toplevel_) {
 			font::draw_floating_labels(frame_buffer);
 		}
 

src/gui/widgets/window.hpp

@@ -536,6 +536,9 @@ private:
 	/** Whether the window should undraw the window using restorer_ */
 	bool restore_;
 
+	/** Whether the window has other windows behind it */
+	bool is_toplevel_;
+
 	/** When the window closes this surface is used to undraw the window. */
 	surface restorer_;