Skip to content

Commit bd651f5

Browse files
committed
use background var from new setup daos
1 parent b13a2c0 commit bd651f5

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

de.peeeq.wurstscript/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ dependencies {
111111
compile 'com.github.inwc3:wc3libs:86f3db6854'
112112

113113
// The setup tool for wurst.build handling
114-
compile 'com.github.wurstscript:wurstsetup:376ce9a330'
114+
compile 'com.github.wurstscript:wurstsetup:4c65824b40'
115115

116116
compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.25'
117117
compile group: 'ch.qos.logback', name: 'logback-classic', version: '1.2.3'

de.peeeq.wurstscript/src/main/java/de/peeeq/wurstio/languageserver/ProjectConfigBuilder.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,10 @@ private static void applyScenarioData(W3I w3I, WurstProjectBuildMapData buildMap
145145
}
146146

147147
private static void applyLoadingScreen(W3I w3I, WurstProjectBuildLoadingScreenData loadingScreen) {
148-
w3I.setLoadingScreenModel(loadingScreen.getModel());
149-
w3I.getLoadingScreen().setBackground(LoadingScreenBackground.PresetBackground.findByName());
148+
if (StringUtils.isNotBlank(loadingScreen.getModel())) {
149+
w3I.setLoadingScreenModel(loadingScreen.getModel());
150+
}
151+
w3I.getLoadingScreen().setBackground(LoadingScreenBackground.PresetBackground.findByName(loadingScreen.getBackground()));
150152
w3I.getLoadingScreen().setTitle(loadingScreen.getTitle());
151153
w3I.getLoadingScreen().setSubtitle(loadingScreen.getSubTitle());
152154
w3I.getLoadingScreen().setText(loadingScreen.getText());

0 commit comments

Comments
 (0)