Skip to content

Fix #247 (crash when X11WindowDriver failed to get window properties) #291

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix #247 (crash when X11WindowDriver failed to get window properties) #291

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion ShiftIt/X11WindowDriver.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,7 @@ - (BOOL) findFocusedWindow:(id<SIWindow> *)window withInfo:(SIWindowInfo *)windo
Window __block * windowRef;

// find the focused window
execWithDisplay_(^BOOL(Display *dpy, NSError **nestedError) {
BOOL result = execWithDisplay_(^BOOL(Display *dpy, NSError **nestedError) {
Window root = DefaultRootWindow(dpy);

// following are for the params that are not used
Expand All @@ -372,6 +372,9 @@ - (BOOL) findFocusedWindow:(id<SIWindow> *)window withInfo:(SIWindowInfo *)windo
}, error);

// verify that this is the window that we were asked to find
if (!result) {
return NO;
}


*window = [[[X11Window alloc] initWithRef:windowRef driver:self] autorelease];
Expand Down