Description: <short summary of the patch>
 TODO: Put a short summary on the line above and replace this paragraph
 with a longer explanation of this change. Complete the meta-information
 with other relevant fields (see below for details). To make it easier, the
 information below has been extracted from the changelog. Adjust it or drop
 it.
 .
 jclic (0.2.1.0-1+lliurex7) precise; urgency=low
 .
   * Added oracle-java7-installer dependence
Author: Jaime Munyoz Fayos <munyoz_jaifay@gva.es>

---
The information above should follow the Patch Tagging Guidelines, please
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
are templates for supplementary fields that you might want to add:

Origin: <vendor|upstream|other>, <url of original patch>
Bug: <url in upstream bugtracker>
Bug-Debian: http://bugs.debian.org/<bugnumber>
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
Forwarded: <no|not-needed|url proving that it has been forwarded>
Reviewed-By: <name and email of someone who approved the patch>
Last-Update: <YYYY-MM-DD>

--- jclic-0.2.1.0.orig/src/core/edu/xtec/jclic/Player.java
+++ jclic-0.2.1.0/src/core/edu/xtec/jclic/Player.java
@@ -1568,6 +1568,7 @@ public class Player extends JPanel imple
                             System.exit(0);
                     } catch(Exception ex){
                         System.err.println("Unable to exit!\n"+ex);
+			System.exit(0);
                     }
                 }
             }
--- jclic-0.2.1.0.orig/src/core/edu/xtec/jclic/media/EventSounds.java
+++ jclic-0.2.1.0/src/core/edu/xtec/jclic/media/EventSounds.java
@@ -220,11 +220,17 @@ public class EventSounds extends Object
     }
     
     public void close(){
+	try{
         for(int i=0; i<NUM_EVENTS; i++)
             if(elements[i]!=null){
                 elements[i].close();
                 elements[i]=null;
             }
+	}
+	catch(Exception ex)
+	{
+		
+	}
         parent=null;
     }
     
--- jclic-0.2.1.0.orig/src/utilities/edu/xtec/util/Messages.java
+++ jclic-0.2.1.0/src/utilities/edu/xtec/util/Messages.java
@@ -114,12 +114,22 @@ public class Messages {
                 //pane.setSelectionValues(DESCRIPTIVE_LANGUAGE_CODES);
                 pane.setSelectionValues(getDescriptiveLanguageCodes(null));
                 pane.setWantsInput(true);
-		//String systemlanguage=Locale.getDefault().getLanguage();
+		String systemlanguage=Locale.getDefault().getLanguage();
 		//System.out.println("System Language: " + systemlanguage);
 		//String selectedlang=(systemlanguage.equals("qc")) ? "qcv" : systemlanguage;
 		//System.out.println("Selected Language: " + systemlanguage);
                 //String initialSelection=getDescriptiveLanguageCode(selectedlang);
-                String initialSelection=getDescriptiveLanguageCode(Locale.getDefault().getLanguage());
+		if (System.getenv("LANG").contains("valenci"))
+		{
+			System.out.println("eieieieiei");
+			systemlanguage="qcv";
+		}
+		else
+		{
+			System.out.println("0e0e0e0e0");
+		}
+                String initialSelection=getDescriptiveLanguageCode(systemlanguage);
+		
                 pane.setInitialSelectionValue(initialSelection);                                
                 showDlg((Component)options.get(Options.MAIN_PARENT_COMPONENT), pane, "Language selecion");
                 String sel=(String)pane.getInputValue();
@@ -667,7 +677,7 @@ public class Messages {
     public static final HashMap ISO_639_2_CODES=new HashMap();
     static{
         ISO_639_2_CODES.put("ast","asturianu");
-        ISO_639_2_CODES.put("qc","valencià");
+        ISO_639_2_CODES.put("qcv","valencià");
 
     }
  
--- jclic-0.2.1.0.orig/src/player/edu/xtec/jclic/SingleInstanceJFrame.java
+++ jclic-0.2.1.0/src/player/edu/xtec/jclic/SingleInstanceJFrame.java
@@ -225,16 +225,21 @@ public class SingleInstanceJFrame extend
     
     /** Exit the Application */
     private void exitForm(java.awt.event.WindowEvent evt) {
-        if(socketThread!=null)
-            socketThread.stopSocketThread();
-        if(rc!=null){
-            rc.end();
-            rc=null;
-        }
-        while(socketThread!=null){
-            Thread.currentThread().yield();
-        }        
-        System.exit(0);
+	try
+	{
+		if(socketThread!=null)
+			socketThread.stopSocketThread();
+		if(rc!=null){
+		rc.end();
+		rc=null;
+		}
+		while(socketThread!=null){
+		Thread.currentThread().yield();
+		}
+	}
+	catch(Exception ex){
+		System.exit(0);
+	}
     }
     
     protected boolean checkOtherInstance(int port){