mirror of
https://invent.kde.org/system/dolphin
synced 2024-10-28 03:21:56 +00:00
Merge branch 'Applications/19.08'
This commit is contained in:
commit
0c4f58328f
10
src/main.cpp
10
src/main.cpp
|
@ -142,11 +142,6 @@ extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv)
|
|||
return app.exec();
|
||||
}
|
||||
|
||||
if (splitView && urls.size() < 2) {
|
||||
// Split view does only make sense if we have at least 2 URLs
|
||||
urls.append(urls.last());
|
||||
}
|
||||
|
||||
if (!parser.isSet(QStringLiteral("new-window"))) {
|
||||
if (Dolphin::attachToExistingInstance(urls, openFiles, splitView)) {
|
||||
// Successfully attached to existing instance of Dolphin
|
||||
|
@ -159,6 +154,11 @@ extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv)
|
|||
urls.append(Dolphin::homeUrl());
|
||||
}
|
||||
|
||||
if (splitView && urls.size() < 2) {
|
||||
// Split view does only make sense if we have at least 2 URLs
|
||||
urls.append(urls.last());
|
||||
}
|
||||
|
||||
DolphinMainWindow* mainWindow = new DolphinMainWindow();
|
||||
|
||||
if (openFiles) {
|
||||
|
|
Loading…
Reference in a new issue