mirror of
https://github.com/amyinspace/MagicSetEditor2.git
synced 2026-06-11 21:27:01 -04:00
Fixed error about enumeration of files in local_data_directory; It should now also find packages from *both* directories.
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@559 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
@@ -86,13 +86,11 @@ bool MSE::OnInit() {
|
||||
// Show the symbol editor
|
||||
Window* wnd = new SymbolWindow(nullptr, argv[1]);
|
||||
wnd->Show();
|
||||
packages.destroy();
|
||||
return true;
|
||||
} else if (f.GetExt() == _("mse-set") || f.GetExt() == _("mse") || f.GetExt() == _("set")) {
|
||||
// Show the set window
|
||||
Window* wnd = new SetWindow(nullptr, import_set(argv[1]));
|
||||
wnd->Show();
|
||||
packages.destroy();
|
||||
return true;
|
||||
} else if (f.GetExt() == _("mse-installer")) {
|
||||
// Installer; install it
|
||||
@@ -102,7 +100,6 @@ bool MSE::OnInit() {
|
||||
} else if (arg == _("--symbol-editor")) {
|
||||
Window* wnd = new SymbolWindow(nullptr);
|
||||
wnd->Show();
|
||||
packages.destroy();
|
||||
return true;
|
||||
} else if (arg == _("--create-installer")) {
|
||||
// create an installer
|
||||
@@ -147,7 +144,6 @@ bool MSE::OnInit() {
|
||||
|
||||
// no command line arguments, or error, show welcome window
|
||||
(new WelcomeWindow())->Show();
|
||||
packages.destroy();
|
||||
return true;
|
||||
|
||||
} catch (const Error& e) {
|
||||
|
||||
Reference in New Issue
Block a user