all repos — fluxbox @ 1f5c8b5ba118c3700f0aac8652f400bf316a97b9

custom fork of the fluxbox windowmanager 

fixed checking on focused_window in handleKeyEvents
fluxgen fluxgen
commit

1f5c8b5ba118c3700f0aac8652f400bf316a97b9

parent

05588b7505a320a47f62b0224c8d640847a81cc0

1 files changed, 10 insertions(+), 6 deletions(-)

jump to
M src/fluxbox.cc → src/fluxbox.cc 
@@ -22,7 +22,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: fluxbox.cc,v 1.55 2002/05/02 07:14:21 fluxgen Exp $
+// $Id: fluxbox.cc,v 1.56 2002/05/08 09:33:11 fluxgen Exp $
 
 //Use GNU extensions
 #ifndef	 _GNU_SOURCE

@@ -1188,16 +1188,20 @@ case Keys::RIGHTWORKSPACE:
 				screen->rightWorkspace(key->getParam());
 			break;
 			case Keys::KILLWINDOW: //kill the current window
-				XKillClient(screen->getBaseDisplay()->getXDisplay(),
-					focused_window->getClientWindow());
+				if (focused_window) {
+					XKillClient(screen->getBaseDisplay()->getXDisplay(),
+						focused_window->getClientWindow());
+				}
 			break;
 			case Keys::NEXTWINDOW:	//activate next window
 				screen->nextFocus(key->getParam());
-				focused_window->getTab()->raise();
+				if (focused_window)
+					focused_window->getTab()->raise();
 			break;
 			case Keys::PREVWINDOW:	//activate prev window
 				screen->prevFocus(key->getParam());
-				focused_window->getTab()->raise();
+				if (focused_window)
+					focused_window->getTab()->raise();
 			break;
 			case Keys::NEXTTAB: 
 				if (focused_window && focused_window->getTab()) {

@@ -1944,7 +1948,7 @@ *m_rc_menufile = (tmpvar==0 ? "" : tmpvar);
 		if (!m_rc_menufile->size())
 			m_rc_menufile.setDefaultValue();
 
-		delete tmpvar;
+		delete [] tmpvar;
 	} else
 		m_rc_menufile.setDefaultValue();