diff options
author | pontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-03-06 18:42:56 +0000 |
---|---|---|
committer | pontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-03-06 18:42:56 +0000 |
commit | 0c0363dc4f4216178aa1457008c31668d328d8dd (patch) | |
tree | 6a6a6eb544ece50f913cc45441dfb7903bae6c3f /Gui/mplayer | |
parent | c3782458eccc3c5883ee6c44bfefded234981498 (diff) | |
download | mpv-0c0363dc4f4216178aa1457008c31668d328d8dd.tar.bz2 mpv-0c0363dc4f4216178aa1457008c31668d328d8dd.tar.xz |
bazmeg a playtree - t
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4951 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Gui/mplayer')
-rw-r--r-- | Gui/mplayer/mw.h | 2 | ||||
-rw-r--r-- | Gui/mplayer/widgets.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Gui/mplayer/mw.h b/Gui/mplayer/mw.h index 92333e3847..cdb34d61c2 100644 --- a/Gui/mplayer/mw.h +++ b/Gui/mplayer/mw.h @@ -559,7 +559,7 @@ int keyPressed = 0; void mplMainKeyHandle( int State,int Type,int Key ) { int msg = evNone; -// return; + if ( Type != wsKeyPressed ) return; switch ( Key ) { diff --git a/Gui/mplayer/widgets.c b/Gui/mplayer/widgets.c index 5d576602fb..157328f0f0 100644 --- a/Gui/mplayer/widgets.c +++ b/Gui/mplayer/widgets.c @@ -31,7 +31,7 @@ GtkWidget * PlayList; GtkWidget * FileSelect; GtkWidget * AboutBox; GtkWidget * Options; -GtkWidget * PopUpMenu; +GtkWidget * PopUpMenu = NULL; GtkWidget * MessageBox; @@ -165,12 +165,12 @@ void gtkShow( int type,char * param ) case evShowPopUpMenu: gtkPopupMenu=evNone; gtkPopupMenuParam=0; - gtk_widget_hide_on_delete( PopUpMenu ); + if ( PopUpMenu ) gtk_widget_hide_on_delete( PopUpMenu ); PopUpMenu=create_PopUpMenu(); gtk_menu_popup( GTK_MENU( PopUpMenu ),NULL,NULL,NULL,NULL,0,0 ); break; case evHidePopUpMenu: - gtk_widget_hide_on_delete( PopUpMenu ); + if ( PopUpMenu ) gtk_widget_hide_on_delete( PopUpMenu ); break; } } |