GUI: more improvements to instrument loading
now with an "instrument load always replace" option
This commit is contained in:
parent
99a313b684
commit
c3e55ae117
4 changed files with 12 additions and 4 deletions
|
|
@ -2930,9 +2930,7 @@ bool FurnaceGUI::loop() {
|
|||
if ((curFileDialog==GUI_FILE_INS_OPEN || curFileDialog==GUI_FILE_INS_OPEN_REPLACE) && prevIns!=-3) {
|
||||
if (curFileDialog==GUI_FILE_INS_OPEN_REPLACE) {
|
||||
if (prevInsData!=NULL) {
|
||||
logI("try");
|
||||
if (prevIns>=0 && prevIns<(int)e->song.ins.size()) {
|
||||
logI("replace");
|
||||
*e->song.ins[prevIns]=*prevInsData;
|
||||
}
|
||||
}
|
||||
|
|
@ -3135,7 +3133,7 @@ bool FurnaceGUI::loop() {
|
|||
showWarning(e->getWarnings(),GUI_WARN_GENERIC);
|
||||
}
|
||||
if (curIns>=0 && curIns<(int)e->song.ins.size()) {
|
||||
*e->song.ins[0]=*instruments[0];
|
||||
*e->song.ins[curIns]=*instruments[curIns];
|
||||
} else {
|
||||
showError("...but you haven't selected an instrument!");
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue