Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-gpu
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-gpu
Commits
b1338135
Commit
b1338135
authored
Mar 16, 2009
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Qt: fix a crash when you don't want to have the recent items. And don't even show the menu.
parent
04af5c7c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
5 deletions
+8
-5
modules/gui/qt4/menus.cpp
modules/gui/qt4/menus.cpp
+6
-3
modules/gui/qt4/recents.cpp
modules/gui/qt4/recents.cpp
+2
-2
No files found.
modules/gui/qt4/menus.cpp
View file @
b1338135
...
@@ -315,9 +315,12 @@ QMenu *QVLCMenu::FileMenu( intf_thread_t *p_intf, QWidget *parent )
...
@@ -315,9 +315,12 @@ QMenu *QVLCMenu::FileMenu( intf_thread_t *p_intf, QWidget *parent )
addDPStaticEntry
(
menu
,
qtr
(
"Open &Location from clipboard"
),
addDPStaticEntry
(
menu
,
qtr
(
"Open &Location from clipboard"
),
NULL
,
SLOT
(
openUrlDialog
()
),
"Ctrl+V"
);
NULL
,
SLOT
(
openUrlDialog
()
),
"Ctrl+V"
);
recentsMenu
=
new
QMenu
(
qtr
(
"&Recent Media"
),
menu
);
if
(
config_GetInt
(
p_intf
,
"qt-recentplay"
)
)
updateRecents
(
p_intf
);
{
menu
->
addMenu
(
recentsMenu
);
recentsMenu
=
new
QMenu
(
qtr
(
"&Recent Media"
),
menu
);
updateRecents
(
p_intf
);
menu
->
addMenu
(
recentsMenu
);
}
menu
->
addMenu
(
SDMenu
(
p_intf
,
menu
)
);
menu
->
addMenu
(
SDMenu
(
p_intf
,
menu
)
);
menu
->
addSeparator
();
menu
->
addSeparator
();
...
...
modules/gui/qt4/recents.cpp
View file @
b1338135
...
@@ -53,7 +53,7 @@ RecentsMRL::RecentsMRL( intf_thread_t *_p_intf ) : p_intf( _p_intf )
...
@@ -53,7 +53,7 @@ RecentsMRL::RecentsMRL( intf_thread_t *_p_intf ) : p_intf( _p_intf )
free
(
psz_tmp
);
free
(
psz_tmp
);
load
();
load
();
if
(
!
isActive
)
clear
();
if
(
!
isActive
)
clear
();
}
}
RecentsMRL
::~
RecentsMRL
()
RecentsMRL
::~
RecentsMRL
()
...
@@ -89,7 +89,7 @@ void RecentsMRL::clear()
...
@@ -89,7 +89,7 @@ void RecentsMRL::clear()
if
(
stack
->
isEmpty
()
)
if
(
stack
->
isEmpty
()
)
return
;
return
;
stack
->
clear
();
stack
->
clear
();
QVLCMenu
::
updateRecents
(
p_intf
);
if
(
!
isActive
)
QVLCMenu
::
updateRecents
(
p_intf
);
save
();
save
();
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment