Merge branch 'ra3xdh-userlib_fix'

Qucs · Jul 4, 2015 · 8628f58 · 8628f58
2 parents d5974ca + 847bb80
commit 8628f58
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/qucs/qucs-lib/qucslib_common.h b/qucs/qucs-lib/qucslib_common.h
@@ -19,6 +19,7 @@
 #define _QUCSLIB_COMMON_H_
 
 #include <QFile>
+#include <QFileInfo>
 #include <QTextStream>
 #include <QDebug>
 
@@ -190,6 +191,10 @@ inline int makeModelString (QString libname, QString compname, QString compstrin
     }
 
     // construct the library model string
+    QString full_userlib = QucsSettings.QucsHomeDir.canonicalPath() // check is it user library or not ?
+            +QDir::convertSeparators ("/user_lib/")+libname;
+    QFileInfo inf(full_userlib+".lib");
+    if (inf.exists()) libname = full_userlib;
     modelstring =  "<Lib " + Prefix + " 1 0 0 " +
                    QString::number(Text_x) + " " +
                    QString::number(Text_y) + " 0 0 \"" +