summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrea Diamantini <adjam7@gmail.com>2012-07-26 11:46:03 +0200
committerAndrea Diamantini <adjam7@gmail.com>2012-07-26 11:46:03 +0200
commit7307ecac10b3879d8dc5732c546deb178a089bd0 (patch)
tree2593961a252b707df19a6ba20fd8de08539b7aba /src
parentLet user customize shortcut name & description. (diff)
downloadrekonq-7307ecac10b3879d8dc5732c546deb178a089bd0.tar.xz
This should fix local files launch by console when rekonq is just loaded
Diffstat (limited to 'src')
-rw-r--r--src/application.cpp2
-rw-r--r--src/main.cpp4
2 files changed, 4 insertions, 2 deletions
diff --git a/src/application.cpp b/src/application.cpp
index 17682647..07cbb0b8 100644
--- a/src/application.cpp
+++ b/src/application.cpp
@@ -72,7 +72,6 @@
// Qt Includes
#include <QVBoxLayout>
-#include <QDir>
#include <QTimer>
@@ -175,7 +174,6 @@ Application::~Application()
int Application::newInstance()
{
- KCmdLineArgs::setCwd(QDir::currentPath().toUtf8());
KCmdLineArgs* args = KCmdLineArgs::parsedArgs();
// not that easy, indeed
diff --git a/src/main.cpp b/src/main.cpp
index de312530..87eb7fa2 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -35,6 +35,8 @@
#include <KAboutData>
#include <KCmdLineArgs>
+// Qt Includes
+#include <QDir>
static const char description[] =
I18N_NOOP("A lightweight Web Browser for KDE based on WebKit");
@@ -212,6 +214,8 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
QCoreApplication::setApplicationName(QL1S("rekonq"));
QCoreApplication::setApplicationVersion(REKONQ_VERSION);
+ KCmdLineArgs::setCwd(QDir::currentPath().toUtf8());
+
if (app.isSessionRestored())
for (int i = 1; MainWindow::canBeRestored(i); i++)
app.newMainWindow(false)->restore(i);