isa/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

windowMenu: Check if monitorIndex is valid before using it

Browse Source 
Calling meta_window_get_monitor on an unmanaged window may return
-1, so we need to check the return value.

https://bugzilla.gnome.org/show_bug.cgi?id=788882
This commit is contained in:
Sam Spilsbury 2017-10-11 18:42:04 +08:00 committed by Marco Trevisan (Treviño)
parent 5fe349d5ba
commit c9bf72c5c4
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
js/ui/windowMenu.js
View File

@ -128,11 +128,10 @@ var WindowMenu = new Lang.Class({
let screen = global.screen; let screen = global.screen;
let nMonitors = screen.get_n_monitors(); let nMonitors = screen.get_n_monitors();
if (nMonitors > 1) { let monitorIndex = window.get_monitor();
if (nMonitors > 1 && monitorIndex >= 0) {
this.addMenuItem(new PopupMenu.PopupSeparatorMenuItem()); this.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
let monitorIndex = window.get_monitor();
let dir = Meta.ScreenDirection.UP; let dir = Meta.ScreenDirection.UP;
let upMonitorIndex = let upMonitorIndex =
screen.get_monitor_neighbor_index(monitorIndex, dir); screen.get_monitor_neighbor_index(monitorIndex, dir);