summaryrefslogtreecommitdiffstats
path: root/dozentenmodul/src/main/java
diff options
context:
space:
mode:
authorJonathan Bauer2014-09-15 17:11:20 +0200
committerJonathan Bauer2014-09-15 17:11:20 +0200
commit689b594498dc48972cab218ae8bd6b0c330a53d2 (patch)
tree92295cb1b4aebc45ffba8c7827b41194a7257227 /dozentenmodul/src/main/java
parent[client] timeouts for getting news per http (diff)
downloadtutor-module-689b594498dc48972cab218ae8bd6b0c330a53d2.tar.gz
tutor-module-689b594498dc48972cab218ae8bd6b0c330a53d2.tar.xz
tutor-module-689b594498dc48972cab218ae8bd6b0c330a53d2.zip
[client] only set news if not null
Diffstat (limited to 'dozentenmodul/src/main/java')
-rw-r--r--dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java b/dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java
index 529dfe9f..87a656f6 100644
--- a/dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java
+++ b/dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java
@@ -268,7 +268,7 @@ public class MainMenue_GUI extends JFrame {
txtNews.setBackground(SystemColor.menu);
txtNews.setWrapStyleWord(true);
txtNews.setLineWrap(true);
- txtNews.setText(News.getContent());
+ if (News.getContent() != null) txtNews.setText(News.getContent());
scrollPaneNews.add(txtNews);
panelNews.add(scrollPaneNews);