Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-1.1
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-1.1
Commits
6eb31e1a
Commit
6eb31e1a
authored
Feb 10, 2008
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Qt4 - Destroy correctly the qt4 interface when used in DP.
parent
0ba85689
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
4 deletions
+11
-4
modules/gui/qt4/qt4.cpp
modules/gui/qt4/qt4.cpp
+9
-4
modules/gui/qt4/qt4.hpp
modules/gui/qt4/qt4.hpp
+2
-0
No files found.
modules/gui/qt4/qt4.cpp
View file @
6eb31e1a
...
...
@@ -248,8 +248,11 @@ static void Close( vlc_object_t *p_this )
p_intf
->
b_dead
=
VLC_TRUE
;
vlc_mutex_unlock
(
&
p_intf
->
object_lock
);
if
(
p_intf
->
p
f_show_dialog
)
if
(
p_intf
->
p
_sys
->
b_isDialogProvider
)
{
DialogEvent
*
event
=
new
DialogEvent
(
INTF_DIALOG_EXIT
,
0
,
NULL
);
QApplication
::
postEvent
(
THEDP
,
static_cast
<
QEvent
*>
(
event
)
);
vlc_thread_join
(
p_intf
);
}
...
...
@@ -309,10 +312,12 @@ static void Init( intf_thread_t *p_intf )
p_intf
->
p_sys
->
p_mi
=
p_mi
;
/* We don't show it because it is done in the MainInterface constructor
p_mi->show(); */
p_intf
->
p_sys
->
b_isDialogProvider
=
false
;
}
else
{
vlc_thread_ready
(
p_intf
);
p_intf
->
p_sys
->
b_isDialogProvider
=
true
;
}
...
...
@@ -342,7 +347,7 @@ static void Init( intf_thread_t *p_intf )
}
/* Explain to the core how to show a dialog :D */
//
p_intf->pf_show_dialog = ShowDialog;
p_intf
->
pf_show_dialog
=
ShowDialog
;
/* Last settings */
app
->
setQuitOnLastWindowClosed
(
false
);
...
...
@@ -357,7 +362,8 @@ static void Init( intf_thread_t *p_intf )
{
int
interval
=
config_GetInt
(
p_intf
,
"qt-updates-days"
);
QSettings
settings
(
"vlc"
,
"vlc-qt-interface"
);
if
(
QDate
::
currentDate
()
>
settings
.
value
(
"updatedate"
).
toDate
().
addDays
(
interval
)
)
if
(
QDate
::
currentDate
()
>
settings
.
value
(
"updatedate"
).
toDate
().
addDays
(
interval
)
)
{
msg_Dbg
(
p_intf
,
"Someone said I need to check updates"
);
/* The constructor of the update Dialog will do the 1st request */
...
...
@@ -387,7 +393,6 @@ static void Init( intf_thread_t *p_intf )
config_PutPsz
(
p_intf
,
"qt-filedialog-path"
,
p_intf
->
p_sys
->
psz_filepath
);
free
(
psz_path
);
}
/*****************************************************************************
...
...
modules/gui/qt4/qt4.hpp
View file @
6eb31e1a
...
...
@@ -56,6 +56,8 @@ struct intf_sys_t
QApplication
*
p_app
;
MainInterface
*
p_mi
;
bool
b_isDialogProvider
;
playlist_t
*
p_playlist
;
msg_subscription_t
*
p_sub
;
///< Subscription to the message bank
...
...
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