blob: b4c62272e19dfc4027929bfa25ad55130d8e7ba6 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
|
--- a/src/force-fullscreen.cpp
+++ b/src/force-fullscreen.cpp
@@ -24,6 +24,7 @@
*/
#include <map>
+#include <vector>
#include <wayfire/core.hpp>
#include <wayfire/seat.hpp>
#include <wayfire/plugin.hpp>
@@ -640,9 +641,22 @@
output->rem_binding(&on_toggle_fullscreen);
wayfire_force_fullscreen_instances.erase(output);
+ // Toggling off erases the entry from backgrounds. Keep view references
+ // in a separate list so cleanup does not invalidate its own iterator.
+ std::vector<wayfire_toplevel_view> views;
for (auto& b : backgrounds)
{
- toggle_fullscreen(b.first);
+ views.push_back(b.first);
+ }
+
+ for (auto view : views)
+ {
+ // Teardown is mandatory even when another plugin or a session lock
+ // prevents user actions. Do not leave transformers referring to
+ // background data which is about to be destroyed.
+ view->toplevel()->pending().fullscreen = false;
+ wf::get_core().tx_manager->schedule_object(view->toplevel());
+ deactivate(view);
}
}
};
|
