Commit 253f97b2 authored by Thomas Eschenbacher's avatar Thomas Eschenbacher

fixed wrong message text in saveblocks plugin

fixed assert in shutdown of selection tracker
parent 4fe719ff
...@@ -87,10 +87,11 @@ Kwave::SelectionTracker::SelectionTracker(Kwave::SignalManager *signal, ...@@ -87,10 +87,11 @@ Kwave::SelectionTracker::SelectionTracker(Kwave::SignalManager *signal,
//*************************************************************************** //***************************************************************************
Kwave::SelectionTracker::~SelectionTracker() Kwave::SelectionTracker::~SelectionTracker()
{ {
Q_ASSERT(m_signal); // unregister us from the undo manager (if it still exists)
// unregister us from the undo manager if (m_signal) {
Kwave::UndoManager &undo = m_signal->undoManager(); Kwave::UndoManager &undo = m_signal->undoManager();
undo.unregisterHandler(this); undo.unregisterHandler(this);
}
} }
//*************************************************************************** //***************************************************************************
......
...@@ -261,8 +261,7 @@ int Kwave::SaveBlocksPlugin::start(QStringList &params) ...@@ -261,8 +261,7 @@ int Kwave::SaveBlocksPlugin::start(QStringList &params)
// check for missing subdirectory // check for missing subdirectory
if (!file_info.dir().exists()) { if (!file_info.dir().exists()) {
QFileInfo inf(display_name); QString missing_dir = file_info.absolutePath();
QString missing_dir = inf.path();
if (!missing_dirs.contains(missing_dir)) if (!missing_dirs.contains(missing_dir))
missing_dirs += missing_dir; missing_dirs += missing_dir;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment