Commit 1dd79c52 authored by Jonas Ådahl's avatar Jonas Ådahl
Browse files

xwayland: Trap errors when setting primary RANDR output

This will be crucial when we start to remove the global directly when an
output is removed, as that means Xwayland might have removed the output
before we managed to get our queries in.

Part-of: <!1796>
parent 39f80885
......@@ -49,6 +49,7 @@
#include "backends/meta-settings-private.h"
#include "meta/main.h"
#include "meta/meta-backend.h"
#include "meta/meta-x11-errors.h"
#include "wayland/meta-xwayland-surface.h"
#include "x11/meta-x11-display-private.h"
......@@ -1374,6 +1375,7 @@ meta_xwayland_set_primary_output (MetaX11Display *x11_display)
if (!resources)
return;
meta_x11_error_trap_push (x11_display);
for (i = 0; i < resources->noutput; i++)
{
RROutput output_id = resources->outputs[i];
......@@ -1407,6 +1409,7 @@ meta_xwayland_set_primary_output (MetaX11Display *x11_display)
break;
}
}
meta_x11_error_trap_pop (x11_display);
XRRFreeScreenResources (resources);
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment