mirror of
https://github.com/amyinspace/MagicSetEditor2.git
synced 2026-06-10 04:57:00 -04:00
Fixed install script and set selection window crash.
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1366 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
@@ -3030,8 +3030,6 @@ else
|
||||
fi
|
||||
|
||||
|
||||
# Do not pass -O2, because that causes failures for now.
|
||||
CXXFLAGS=-g
|
||||
# Checks for libraries.
|
||||
ac_ext=c
|
||||
ac_cpp='$CPP $CPPFLAGS'
|
||||
|
||||
@@ -97,11 +97,11 @@ void WelcomeWindow::draw(DC& dc) {
|
||||
}
|
||||
|
||||
void WelcomeWindow::onOpenSet(wxCommandEvent&) {
|
||||
wxFileDialog dlg(this, _TITLE_("open set"), settings.default_set_dir, wxEmptyString, import_formats(), wxOPEN);
|
||||
if (dlg.ShowModal() == wxID_OK) {
|
||||
settings.default_set_dir = dlg.GetDirectory();
|
||||
wxFileDialog* dlg = new wxFileDialog(this, _TITLE_("open set"), settings.default_set_dir, wxEmptyString, import_formats(), wxOPEN);
|
||||
if (dlg->ShowModal() == wxID_OK) {
|
||||
settings.default_set_dir = dlg->GetDirectory();
|
||||
wxBusyCursor wait;
|
||||
close(import_set(dlg.GetPath()));
|
||||
close(import_set(dlg->GetPath()));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -15,14 +15,7 @@ case $UID in
|
||||
*)
|
||||
INSTALL_DIR='$HOME/.magicseteditor/';
|
||||
EXEC_SYMLINK='$HOME/bin/magicseteditor';
|
||||
esac
|
||||
|
||||
if [ \"$MSE_INSTALL_DIR\" != "" ] then
|
||||
INSTALL_DIR=$MSE_INSTALL_DIR
|
||||
fi
|
||||
if [ \"$MSE_EXEC_SYMLINK\" != "" ] then
|
||||
INSTALL_DIR=$MSE_EXEC_SYMLINK
|
||||
fi
|
||||
esac;
|
||||
|
||||
echo "Magic Set Editor version $VERSION Installer Script.
|
||||
|
||||
|
||||
Reference in New Issue
Block a user