[matroska] r1121 - trunk/DvdMenuXtractor

Author: robux4
Date: 2005-04-10 12:48:40 +0400 (Sun, 10 Apr 2005)
New Revision: 1121

Modified:
   trunk/DvdMenuXtractor/DvdMenuXtractor.cpp
Log:
DMX: handle dir names without a trailing separator

Modified: trunk/DvdMenuXtractor/DvdMenuXtractor.cpp
===================================================================
--- trunk/DvdMenuXtractor/DvdMenuXtractor.cpp	2005-04-10 07:32:33 UTC (rev 1120)
+++ trunk/DvdMenuXtractor/DvdMenuXtractor.cpp	2005-04-10 08:48:40 UTC (rev 1121)
@@ -268,19 +268,25 @@
 
 	bool OutputExists()
 	{
-		wxFileName _DirName(m_edOutDir->GetValue());
+		wxFileName _DirName;
+
+		_DirName = wxConfigBase::Get()->Read(OutputDirSaved,"") + wxFileName::GetPathSeparator();
 		if (!_DirName.DirExists())
 		{
 			wxLogError("Cannot use output directory '%s'", _DirName.GetPath(wxPATH_GET_VOLUME).c_str());
 			return false;
 		}
-		else
+		outputDirectory = _DirName.GetPath(wxPATH_GET_VOLUME | wxPATH_GET_SEPARATOR );
+
+		_DirName = wxConfigBase::Get()->Read(MtxDirSaved,"") + wxFileName::GetPathSeparator();
+		if (!_DirName.DirExists())
 		{
-			outputDirectory = wxConfigBase::Get()->Read(OutputDirSaved,"");
-			mtxDirectory = wxConfigBase::Get()->Read(MtxDirSaved,"");
+			wxLogError("Cannot find the mkvmerge directory '%s'", _DirName.GetPath(wxPATH_GET_VOLUME).c_str());
+			return false;
+		}
+		mtxDirectory = _DirName.GetPath(wxPATH_GET_VOLUME | wxPATH_GET_SEPARATOR );
 
-			return true;
-		}
+		return true;
 	}
 
     bool OpenIfoFile()