From b47c0fc3a39a4fc616d1324e9dfbd5b82be3f5f2 Mon Sep 17 00:00:00 2001
From: Matthias Koefferlein <matthias@koefferlein.de>
Date: Wed, 27 Jun 2018 23:36:30 +0200
Subject: [PATCH] Fixed #139 (libraries not reassigned to GDS when loading file
 from command line).

---
 src/lay/lay/layLibraryController.cc | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/lay/lay/layLibraryController.cc b/src/lay/lay/layLibraryController.cc
index 47f08f59e..aad93b354 100644
--- a/src/lay/lay/layLibraryController.cc
+++ b/src/lay/lay/layLibraryController.cc
@@ -117,13 +117,11 @@ LibraryController::can_exit (lay::PluginRoot * /*root*/) const
 void
 LibraryController::sync_files ()
 {
-  if (! m_file_watcher) {
-    return;
+  if (m_file_watcher) {
+    m_file_watcher->clear ();
+    m_file_watcher->enable (false);
   }
 
-  m_file_watcher->clear ();
-  m_file_watcher->enable (false);
-
   std::map<std::string, std::pair<std::string, QDateTime> > new_lib_files;
 
   //  build a list of paths vs. technology
@@ -158,7 +156,9 @@ LibraryController::sync_files ()
     QDir lp = QDir (tl::to_qstring (p->first)).filePath (tl::to_qstring ("libraries"));
     if (lp.exists ()) {
 
-      m_file_watcher->add_file (tl::to_string (lp.absolutePath ()));
+      if (m_file_watcher) {
+        m_file_watcher->add_file (tl::to_string (lp.absolutePath ()));
+      }
 
       QStringList name_filters;
       name_filters << QString::fromUtf8 ("*");
@@ -222,7 +222,9 @@ LibraryController::sync_files ()
 
   }
 
-  m_file_watcher->enable (true);
+  if (m_file_watcher) {
+    m_file_watcher->enable (true);
+  }
 
   //  remove libraries which are no longer present