Less clunky
Don't display the reload exit message before checking dependencies.
This commit is contained in:
@@ -657,6 +657,7 @@ public class Mods implements Loadable{
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** Assume mods in toCheck are missing dependencies. */
|
||||||
private void checkDependencies(Seq<LoadedMod> toCheck){
|
private void checkDependencies(Seq<LoadedMod> toCheck){
|
||||||
new Dialog(""){{
|
new Dialog(""){{
|
||||||
setFillParent(true);
|
setFillParent(true);
|
||||||
@@ -756,8 +757,10 @@ public class Mods implements Loadable{
|
|||||||
if(newImports.any()){
|
if(newImports.any()){
|
||||||
checkDependencies(newImports);
|
checkDependencies(newImports);
|
||||||
}else{
|
}else{
|
||||||
Log.info("Exiting to reload mods.");
|
ui.showInfoOnHidden("@mods.reloadexit", () -> {
|
||||||
Core.app.exit();
|
Log.info("Exiting to reload mods.");
|
||||||
|
Core.app.exit();
|
||||||
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -93,7 +93,7 @@ public class ModsDialog extends BaseDialog{
|
|||||||
|
|
||||||
hidden(() -> {
|
hidden(() -> {
|
||||||
if(mods.requiresReload()){
|
if(mods.requiresReload()){
|
||||||
reload();
|
mods.reload();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -361,10 +361,6 @@ public class ModsDialog extends BaseDialog{
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void reload(){
|
|
||||||
ui.showInfoOnHidden("@mods.reloadexit", () -> mods.reload());
|
|
||||||
}
|
|
||||||
|
|
||||||
private void showMod(LoadedMod mod){
|
private void showMod(LoadedMod mod){
|
||||||
BaseDialog dialog = new BaseDialog(mod.meta.displayName);
|
BaseDialog dialog = new BaseDialog(mod.meta.displayName);
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user