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

Conflicts:
	fdghf
Dozentenmodul/bin/gui/image/DeleteImage_GUI.class
	Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI$2.class
	Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI$3.class
	Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI.class
	Dozentenmodul/src/gui/image/DeleteImage_GUI.java

1 files changed, 5 insertions, 4 deletions

diff --git a/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java b/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java
index 62cebb22..ac923dca 100644
--- a/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java
+++ b/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java
@@ -68,7 +68,7 @@ public class CreateLectureLink_GUI extends JFrame {
 	String[] titles = { "Image-Name", "Lizenzpflichtig", "OS", "Veranstaltung",
 			"Verantwortlicher", "Letztes Update", "Schlagwort" };
 	ThriftConnection con = new ThriftConnection();
-	Client client = con.getThriftConnection();
+	Client client = models.Client.clientcon.getClient();
 
 	/**
 	 * Launch the application.
@@ -90,6 +90,7 @@ public class CreateLectureLink_GUI extends JFrame {
 		addWindowListener(new WindowAdapter() {
 			@Override
 			public void windowClosing(WindowEvent arg0) {
+				con.closeThriftConnection();
 				System.exit(0);
 			}
 
@@ -349,7 +350,7 @@ public class CreateLectureLink_GUI extends JFrame {
 				JButton cancelButton = new JButton("Zur\u00FCck");
 				cancelButton.addActionListener(new ActionListener() {
 					public void actionPerformed(ActionEvent e) {
-						con.closeThriftConnection();
+						
 						CreateLectureAllgemein_GUI eVAG = new CreateLectureAllgemein_GUI();
 						eVAG.setVisible(true);
 						dispose();
@@ -397,7 +398,7 @@ public class CreateLectureLink_GUI extends JFrame {
 										person.verantwortlicher.getHochschule(),
 										person.verantwortlicher.getEMail(),
 										person.verantwortlicher.getTel(),
-										person.verantwortlicher.getFakultät());
+										person.verantwortlicher.getFakultaet());
 								JOptionPane
 										.showMessageDialog(
 												null,
@@ -420,7 +421,7 @@ public class CreateLectureLink_GUI extends JFrame {
 										e1.getCause()+"\n"+e1.getMessage(),
 										"Debug-Message", JOptionPane.ERROR_MESSAGE);
 							}
-							con.closeThriftConnection();
+							
 							dispose();
 
 						} else {