Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Network
Konqueror
Commits
bebc1972
Commit
bebc1972
authored
Apr 27, 2020
by
David Faure
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make `konqueror` open a window even if already running.
BUG: 388333 FIXED-IN: 20.04.1
parent
d6e3f653
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
5 deletions
+10
-5
src/konqmain.cpp
src/konqmain.cpp
+10
-5
No files found.
src/konqmain.cpp
View file @
bebc1972
...
...
@@ -89,16 +89,21 @@ static KonqMainWindow* handleCommandLine(QCommandLineParser &parser, const QStri
}
}
const
bool
firstStart
=
!
KonqMainWindow
::
mainWindowList
();
// Ask the user to recover session if applicable
KonqSessionManager
::
self
()
->
askUserToRestoreAutosavedAbandonedSessions
();
if
(
args
.
isEmpty
())
{
// No args. If --silent, do nothing, otherwise create a default window.
if
(
!
parser
.
isSet
(
"silent"
))
{
// If session recovery created some windows, no need for an empty window here.
QList
<
KonqMainWindow
*>
*
mainWindowList
=
KonqMainWindow
::
mainWindowList
();
if
(
mainWindowList
&&
!
mainWindowList
->
isEmpty
())
{
return
mainWindowList
->
at
(
0
);
// #388333
if
(
firstStart
)
{
// If session recovery created some windows, no need for an empty window here.
QList
<
KonqMainWindow
*>
*
mainWindowList
=
KonqMainWindow
::
mainWindowList
();
if
(
mainWindowList
&&
!
mainWindowList
->
isEmpty
())
{
return
mainWindowList
->
at
(
0
);
}
}
KonqMainWindow
*
mainWin
=
KonqMainWindowFactory
::
createNewWindow
();
...
...
@@ -257,7 +262,7 @@ extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv)
KWindowSystem
::
forceActiveWindow
(
mainWindow
->
winId
());
}
});
fixOldStartUrl
();
if
(
app
.
isSessionRestored
())
{
...
...
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