--- a/Tools__Inspector2.st	Tue Feb 18 18:28:47 2014 +0100
+++ b/Tools__Inspector2.st	Wed Feb 19 00:06:42 2014 +0100
@@ -998,15 +998,20 @@
 !
 
 updateEvaluationLanguage
-    | evaluationLanguage |
+    | evaluationLanguage objectsLanguage lastLanguage |
 
     evaluationLanguage :=  self evaluationLanguageHolder value.
     "/ Remember user's selection for future...
-    EvaluationLanguageMap at: self currentObject class programmingLanguage put: evaluationLanguage.
+    objectsLanguage := self currentObject class programmingLanguage.
+    lastLanguage := EvaluationLanguageMap at: objectsLanguage ifAbsent: [ objectsLanguage ].
+    lastLanguage ~~ evaluationLanguage ifTrue:[ 
+        EvaluationLanguageMap at: objectsLanguage put: evaluationLanguage 
+    ].
     "/ Update compiler class in all inspectors...
     self setDoItActionForLanguage: evaluationLanguage.
 
     "Created: / 26-10-2013 / 00:36:33 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 18-02-2014 / 23:03:55 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 updateEvaluationLanguageList
@@ -1203,14 +1208,19 @@
 !
 
 inspect:anObject 
+    | objectsLanguage |
+
     self navigationHistoryHolder currentItem:(NavigationState for:anObject).
     self window notNil ifTrue:[
         self updateWindowLabel
     ].
+    objectsLanguage := anObject class programmingLanguage.
+    self evaluationLanguageHolder value:(EvaluationLanguageMap at: objectsLanguage ifAbsent: [ objectsLanguage ]).
 
     "Modified: / 27-02-2008 / 12:06:52 / janfrog"
     "Modified: / 15-07-2011 / 16:26:03 / cg"
     "Modified (format): / 19-08-2011 / 09:01:20 / cg"
+    "Modified: / 18-02-2014 / 23:05:09 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 openOn: anObject
@@ -1271,6 +1281,7 @@
     "Created: / 26-10-2013 / 01:13:15 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
+
 !Inspector2::NavigationState class methodsFor:'creating classes'!
 
 for:anObject 
@@ -1286,11 +1297,11 @@
 !Inspector2::NavigationState class methodsFor:'documentation'!
 
 version
-    ^'$Header: /cvs/stx/stx/libtool/Tools__Inspector2.st,v 1.45 2014-02-15 18:36:39 cg Exp $'
+    ^'$Header: /cvs/stx/stx/libtool/Tools__Inspector2.st,v 1.46 2014-02-18 23:06:42 vrany Exp $'
 !
 
 version_SVN
-    ^'$Id: Tools__Inspector2.st,v 1.45 2014-02-15 18:36:39 cg Exp $'
+    ^'$Id: Tools__Inspector2.st,v 1.46 2014-02-18 23:06:42 vrany Exp $'
 ! !
 
 !Inspector2::NavigationState methodsFor:'accessing'!
@@ -1518,19 +1529,19 @@
 !Inspector2 class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__Inspector2.st,v 1.45 2014-02-15 18:36:39 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__Inspector2.st,v 1.46 2014-02-18 23:06:42 vrany Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__Inspector2.st,v 1.45 2014-02-15 18:36:39 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__Inspector2.st,v 1.46 2014-02-18 23:06:42 vrany Exp $'
 !
 
 version_CVS_jvrany
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__Inspector2.st,v 1.45 2014-02-15 18:36:39 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__Inspector2.st,v 1.46 2014-02-18 23:06:42 vrany Exp $'
 !
 
 version_SVN
-    ^ '$Id: Tools__Inspector2.st,v 1.45 2014-02-15 18:36:39 cg Exp $'
+    ^ '$Id: Tools__Inspector2.st,v 1.46 2014-02-18 23:06:42 vrany Exp $'
 ! !