Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module

Conflicts: delete Image db and server
	Dozentenmodul/bin/gui/intro/MainMenue_GUI.class
	Dozentenmodulserver/bin/server/ServerHandler.class
	Dozentenmodulserver/bin/sql/SQL.class
	Dozentenmodulserver/src/sql/SQL.java

1 files changed, 2 insertions, 1 deletions

diff --git a/Dozentenmodul/src/gui/lecture/EditLectureAllgemein_GUI.java b/Dozentenmodul/src/gui/lecture/EditLectureAllgemein_GUI.java
index 40b3ce84..115a9f1f 100644
--- a/Dozentenmodul/src/gui/lecture/EditLectureAllgemein_GUI.java
+++ b/Dozentenmodul/src/gui/lecture/EditLectureAllgemein_GUI.java
@@ -361,13 +361,14 @@ public class EditLectureAllgemein_GUI extends JFrame {
 						}
 						
 						Lecture.lecture.setName(textFieldLaborname.getText());
+						Lecture.lecture.setNewName(textFieldLaborname.getText());
 						Lecture.lecture.setDesc(description.getText());
 						Lecture.lecture.setEnddate(dateChooserend.getDate());
 						Lecture.lecture.setStartdate(dateChooserstart.getDate());
 						Image.image.setImagename(textFieldLaborname.getText());
 						
 
-					CreateLectureLink_GUI ev=new CreateLectureLink_GUI();
+					EditLectureLink_GUI ev=new EditLectureLink_GUI();
 					ev.setVisible(true);
 					dispose();
 					}