Date: Mon, 27 Jul 2015 19:29:09 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r393023 - in head/x11-fm/wcmcommander: . files Message-ID: <201507271929.t6RJT9ap032466@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Mon Jul 27 19:29:08 2015 New Revision: 393023 URL: https://svnweb.freebsd.org/changeset/ports/393023 Log: - Add upstream patch which fixes crash on alt+tab PR: 201723 Submitted by: enitarzi@gmail.com MFH: 2015Q3 (blanket) Added: head/x11-fm/wcmcommander/files/ head/x11-fm/wcmcommander/files/patch-src_swl_swl_wincoreUX.cpp (contents, props changed) Modified: head/x11-fm/wcmcommander/Makefile Modified: head/x11-fm/wcmcommander/Makefile ============================================================================== --- head/x11-fm/wcmcommander/Makefile Mon Jul 27 19:26:18 2015 (r393022) +++ head/x11-fm/wcmcommander/Makefile Mon Jul 27 19:29:08 2015 (r393023) @@ -3,6 +3,7 @@ PORTNAME= wcmcommander PORTVERSION= 0.20.0 +PORTREVISION= 1 DISTVERSIONPREFIX= release- CATEGORIES= x11-fm Added: head/x11-fm/wcmcommander/files/patch-src_swl_swl_wincoreUX.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-fm/wcmcommander/files/patch-src_swl_swl_wincoreUX.cpp Mon Jul 27 19:29:08 2015 (r393023) @@ -0,0 +1,48 @@ +commit 2fd0f94b4ea96bf3f67d53ebda4f40bc82711bb9 +Author: Oleg Panashchenko <helg.git@helg.com> +Date: Thu Apr 30 13:53:04 2015 -0400 + + Fixed #486 + + was a regression from 02bed4d + +diff --git src/swl/swl_wincoreUX.cpp src/swl/swl_wincoreUX.cpp +index a161e24..7926b6a 100644 +--- src/swl/swl_wincoreUX.cpp ++++ src/swl/swl_wincoreUX.cpp +@@ -1166,22 +1166,22 @@ static const char* getEventName(int id) + { + // close all popups + Win* w = GetWinByID( activeWinId ); +- //dbg_printf("FocusOut %s\n", typeid(*w).name()); +- while(w->parent) +- w=w->parent; +- ccollect<WinID> wl; +- w->PopupTreeList( wl ); +- //dbg_printf("PopupTreeList size=%d\n",wl.count()); +- for(int i=0;i<wl.count();i++) ++ if( w ) + { +- Win* popup = GetWinByID( wl[i] ); +- if(popup) ++ while(w->parent) ++ w=w->parent; ++ ccollect<WinID> wl; ++ w->PopupTreeList( wl ); ++ for(int i=0;i<wl.count();i++) + { +- //dbg_printf("Closing %s\n", typeid(*w).name()); +- if(popup->parent) +- popup->Parent()->Command( CMD_MENU_INFO, SCMD_MENU_CANCEL, popup, 0 ); ++ Win* popup = GetWinByID( wl[i] ); ++ if(popup) ++ { ++ if(popup->parent) ++ popup->Parent()->Command( CMD_MENU_INFO, SCMD_MENU_CANCEL, popup, 0 ); ++ } ++ + } +- + } + } +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201507271929.t6RJT9ap032466>