From kde-commits Mon Sep 13 08:33:55 2010 From: Dawit Alemayehu Date: Mon, 13 Sep 2010 08:33:55 +0000 To: kde-commits Subject: KDE/kdelibs/kfile Message-Id: <20100913083355.B9864AC887 () svn ! kde ! org> X-MARC-Message: https://marc.info/?l=kde-commits&m=128436657018566 SVN commit 1174798 by adawit: Do not expand filenames that start with the tilde mark M +3 -3 knewfilemenu.cpp --- trunk/KDE/kdelibs/kfile/knewfilemenu.cpp #1174797:1174798 @@ -53,9 +53,9 @@ #include #include -static QString expandTilde(const QString& name) +static QString expandTilde(const QString& name, bool isfile = false) { - if (!name.isEmpty()) + if (!name.isEmpty() && (!isfile || name[0] == '\\')) { const QString expandedName = KShell::tildeExpand(name); // When a tilde mark cannot be properly expanded, the above call @@ -499,7 +499,7 @@ { m_tempFileToDelete = m_strategy.tempFileToDelete(); const QString src = m_strategy.sourceFileToCopy(); - const QString chosenFileName = expandTilde(m_strategy.chosenFileName()); + QString chosenFileName = expandTilde(m_strategy.chosenFileName(), true); if (src.isEmpty()) return;