Commit ef464a4e authored by coppro's avatar coppro

Fixed install script and set selection window crash.

parent 4c24a283
...@@ -3030,8 +3030,6 @@ else ...@@ -3030,8 +3030,6 @@ else
fi fi
# Do not pass -O2, because that causes failures for now.
CXXFLAGS=-g
# Checks for libraries. # Checks for libraries.
ac_ext=c ac_ext=c
ac_cpp='$CPP $CPPFLAGS' ac_cpp='$CPP $CPPFLAGS'
......
...@@ -30,10 +30,10 @@ WelcomeWindow::WelcomeWindow() ...@@ -30,10 +30,10 @@ WelcomeWindow::WelcomeWindow()
, logo2(load_resource_image(_("two_beta"))) , logo2(load_resource_image(_("two_beta")))
{ {
SetIcon(load_resource_icon(_("app"))); SetIcon(load_resource_icon(_("app")));
// init controls // init controls
#ifdef USE_HOVERBUTTON #ifdef USE_HOVERBUTTON
wxControl* new_set = new HoverButtonExt(this, ID_FILE_NEW, load_resource_image(_("welcome_new")), _BUTTON_("new set"), _HELP_("new set")); wxControl* new_set = new HoverButtonExt(this, ID_FILE_NEW, load_resource_image(_("welcome_new")), _BUTTON_("new set"), _HELP_("new set"));
wxControl* open_set = new HoverButtonExt(this, ID_FILE_OPEN, load_resource_image(_("welcome_open")), _BUTTON_("open set"), _HELP_("open set")); wxControl* open_set = new HoverButtonExt(this, ID_FILE_OPEN, load_resource_image(_("welcome_open")), _BUTTON_("open set"), _HELP_("open set"));
#if !USE_OLD_STYLE_UPDATE_CHECKER #if !USE_OLD_STYLE_UPDATE_CHECKER
wxControl* updates = new HoverButtonExt(this, ID_FILE_CHECK_UPDATES, load_resource_image(_("welcome_updates")), _BUTTON_("check updates"), _HELP_("check updates")); wxControl* updates = new HoverButtonExt(this, ID_FILE_CHECK_UPDATES, load_resource_image(_("welcome_updates")), _BUTTON_("check updates"), _HELP_("check updates"));
...@@ -57,7 +57,7 @@ WelcomeWindow::WelcomeWindow() ...@@ -57,7 +57,7 @@ WelcomeWindow::WelcomeWindow()
#endif #endif
} }
} }
wxSizer* s1 = new wxBoxSizer(wxHORIZONTAL); wxSizer* s1 = new wxBoxSizer(wxHORIZONTAL);
s1->AddSpacer(25); s1->AddSpacer(25);
wxSizer* s2 = new wxBoxSizer(wxVERTICAL); wxSizer* s2 = new wxBoxSizer(wxVERTICAL);
...@@ -97,11 +97,11 @@ void WelcomeWindow::draw(DC& dc) { ...@@ -97,11 +97,11 @@ void WelcomeWindow::draw(DC& dc) {
} }
void WelcomeWindow::onOpenSet(wxCommandEvent&) { void WelcomeWindow::onOpenSet(wxCommandEvent&) {
wxFileDialog dlg(this, _TITLE_("open set"), settings.default_set_dir, wxEmptyString, import_formats(), wxOPEN); wxFileDialog* dlg = new wxFileDialog(this, _TITLE_("open set"), settings.default_set_dir, wxEmptyString, import_formats(), wxOPEN);
if (dlg.ShowModal() == wxID_OK) { if (dlg->ShowModal() == wxID_OK) {
settings.default_set_dir = dlg.GetDirectory(); settings.default_set_dir = dlg->GetDirectory();
wxBusyCursor wait; wxBusyCursor wait;
close(import_set(dlg.GetPath())); close(import_set(dlg->GetPath()));
} }
} }
......
...@@ -15,14 +15,7 @@ case $UID in ...@@ -15,14 +15,7 @@ case $UID in
*) *)
INSTALL_DIR='$HOME/.magicseteditor/'; INSTALL_DIR='$HOME/.magicseteditor/';
EXEC_SYMLINK='$HOME/bin/magicseteditor'; EXEC_SYMLINK='$HOME/bin/magicseteditor';
esac esac;
if [ \"$MSE_INSTALL_DIR\" != "" ] then
INSTALL_DIR=$MSE_INSTALL_DIR
fi
if [ \"$MSE_EXEC_SYMLINK\" != "" ] then
INSTALL_DIR=$MSE_EXEC_SYMLINK
fi
echo "Magic Set Editor version $VERSION Installer Script. echo "Magic Set Editor version $VERSION Installer Script.
......
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