[Valgrind-valkyrie-dev] valkyrie: r430 - trunk/valkyrie/core

[<sv...@va...>]

Author: cerion
Date: 2008-06-09 23:01:23 +0100 (Mon, 09 Jun 2008)
New Revision: 430

Log:
Whoops: set tmp log dir correct for merging too.



Modified:
   trunk/valkyrie/core/memcheck_object.cpp


Modified: trunk/valkyrie/core/memcheck_object.cpp
===================================================================
--- trunk/valkyrie/core/memcheck_object.cpp	2008-06-09 21:25:32 UTC (rev 429)
+++ trunk/valkyrie/core/memcheck_object.cpp	2008-06-09 22:01:23 UTC (rev 430)
@@ -428,14 +428,16 @@
 /* if --merge=<file_list> was specified on the cmd-line, called by
    valkyrie->runTool(); if set via the open-file-dialog in the gui,
    called by MemcheckView::openMergeFile().  either way, the value in
-   [valkyrie:merge] is what we need to know */
+   [valkyrie:merge] is what we need to know
+
+   Auto-generated logs always saved in hard-coded (configured) log dir
+*/
 bool Memcheck::mergeLogFiles()
 {
    QString fname_logList = vkConfig->rdEntry( "merge", "valkyrie" );
    statusMsg( "Merging logs in file-list", fname_logList );
  
-   QString logDir = vkConfig->rdEntry( "default-logdir", "valkyrie" );
-   m_saveFname = vk_mkstemp( logDir + "mc_merged", "xml" );
+   m_saveFname = vk_mkstemp( QString( VK_LOGS_DIR ) + "mc_merged", "xml" );
    vk_assert( !m_saveFname.isEmpty() );
 
    QStringList flags;