Fix bug: correct user preferences file loading for SALOME-based applications

diff --git a/src/Session/SALOME_Session_Server.cxx b/src/Session/SALOME_Session_Server.cxx
index 1a9987a544330f18f576f83a8cc8cecd9ed7801f..8ae2b1d7254b3aa57fb569ac468579b9915dbad1 100755 (executable)
--- a/src/Session/SALOME_Session_Server.cxx
+++ b/src/Session/SALOME_Session_Server.cxx
@@ -165,6 +165,7 @@ public:
   {
     if ( myExtAppName.isNull() || myExtAppVersion.isNull() ) {
       SALOME_ResourceMgr resMgr( "SalomeApp", QString( "%1Config" ) );
+      resMgr.loadLanguage( "LightApp",  "en" );
       resMgr.loadLanguage( "SalomeApp", "en" );
 
       myExtAppName = QObject::tr( "APP_NAME" ).stripWhiteSpace();
@@ -189,29 +190,30 @@ protected:
 
   virtual int userFileId( const QString& _fname ) const
   {
-    QRegExp exp( "\\.SalomeApprc\\.([a-zA-Z0-9.]+)$" );
-    QRegExp vers_exp( "^([0-9]+)([A-Za-z]?)([0-9]*)$" );
-
-    QString fname = QFileInfo( _fname ).fileName();
-    if( exp.exactMatch( fname ) )
-    {
-      QStringList vers = QStringList::split( ".", exp.cap( 1 ) );
-      int major=0, minor=0;
-      major = vers[0].toInt();
-      minor = vers[1].toInt();
-      if( vers_exp.search( vers[2] )==-1 )
-       return -1;
-      int release = 0, dev1 = 0, dev2 = 0;
-      release = vers_exp.cap( 1 ).toInt();
-      dev1 = vers_exp.cap( 2 )[ 0 ].latin1();
-      dev2 = vers_exp.cap( 3 ).toInt();
-
-      int dev = dev1*100+dev2, id = major;
-      id*=100; id+=minor;
-      id*=100; id+=release;
-      id*=10000;
-      if ( dev > 0 ) id+=dev-10000;
-      return id;
+    if ( !myExtAppName.isEmpty() ) {
+      QRegExp exp( QString( "\\.%1rc\\.([a-zA-Z0-9.]+)$" ).arg( myExtAppName ) );
+      QRegExp vers_exp( "^([0-9]+)([A-Za-z]?)([0-9]*)$" );
+      
+      QString fname = QFileInfo( _fname ).fileName();
+      if( exp.exactMatch( fname ) ) {
+       QStringList vers = QStringList::split( ".", exp.cap( 1 ) );
+       int major=0, minor=0;
+       major = vers[0].toInt();
+       minor = vers[1].toInt();
+       if( vers_exp.search( vers[2] )==-1 )
+         return -1;
+       int release = 0, dev1 = 0, dev2 = 0;
+       release = vers_exp.cap( 1 ).toInt();
+       dev1 = vers_exp.cap( 2 )[ 0 ].latin1();
+       dev2 = vers_exp.cap( 3 ).toInt();
+       
+       int dev = dev1*100+dev2, id = major;
+       id*=100; id+=minor;
+       id*=100; id+=release;
+       id*=10000;
+       if ( dev > 0 ) id+=dev-10000;
+       return id;
+      }
     }
 
     return -1;