aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--data/defscript/popups.kvs2
-rw-r--r--src/kvirc/kernel/kvi_app_fs.cpp2
-rw-r--r--src/modules/file/libkvifile.cpp4
3 files changed, 4 insertions, 4 deletions
diff --git a/data/defscript/popups.kvs b/data/defscript/popups.kvs
index 265ee36e3..33b91cc78 100644
--- a/data/defscript/popups.kvs
+++ b/data/defscript/popups.kvs
@@ -1181,7 +1181,7 @@ defpopup(logging)
# If this window is being logged actually , $log.file will be non empty
# and pointing to the log file actually open.
- %:logfile = $str.replace($log.file,,$file.localdir)
+ %:logfile = $file.extractfilename($log.file)
}
label($tr("Logging to"):<br><b>%:logfile</b>) ("%:logfile" != "")
diff --git a/src/kvirc/kernel/kvi_app_fs.cpp b/src/kvirc/kernel/kvi_app_fs.cpp
index 02f3399da..05642f648 100644
--- a/src/kvirc/kernel/kvi_app_fs.cpp
+++ b/src/kvirc/kernel/kvi_app_fs.cpp
@@ -128,7 +128,7 @@ void KviApp::getLocalKvircDirectory(QString &szData,KvircSubdir dir,const QStrin
szData = szData.remove(szData.length()-1,1);
if(szData.isEmpty())
{
- szData = QDir::homePath();
+ szData = m_szLocalKvircDir;
if(!szData.endsWith(QString(QChar(KVI_PATH_SEPARATOR_CHAR))))
szData.append(KVI_PATH_SEPARATOR_CHAR);
szData.append("log");
diff --git a/src/modules/file/libkvifile.cpp b/src/modules/file/libkvifile.cpp
index 2fa8d56ef..e2d420bb1 100644
--- a/src/modules/file/libkvifile.cpp
+++ b/src/modules/file/libkvifile.cpp
@@ -1174,14 +1174,14 @@ static bool file_kvs_fnc_extractpath(KviKvsModuleFunctionCall * c)
@short:
Extract the filename from a file path
@syntax:
- <string> $file.extractpath(<filepath:string>)
+ <string> $file.extractfilename(<filepath:string>)
@description:
Returns the filename part of the filepath translated to match the current
platform filesystem conventions.[br]
For example, if <filepath> is /usr/arch/mp3/Carisma_SuonoDelSilenzio.mp3 then
this function will return Carisma_SuonoDelSilenzio.mp3
@seealso:
- [fnc]$file.extractPath[/fnc]
+ [fnc]$file.extractfilename[/fnc]
*/
static bool file_kvs_fnc_extractfilename(KviKvsModuleFunctionCall * c)