[Kst] extragear/graphics/kst/src

[George Staikos]

SVN commit 576347 by staikos:

Keep attempted vector loads from the commandline around.  This allows for
delayed file population to work.


 M  +3 -6      kst/main.cpp  
 M  +9 -0      libkst/stdinsource.cpp  


--- trunk/extragear/graphics/kst/src/kst/main.cpp #576346:576347
@@ -270,14 +270,11 @@
   }
 
   V = new KstRVector(file, field, KST::suggestVectorName(field), in.f, in.n, in.skip, in.doskip, in.doave);
-  if (V->isValid()) {
-    KST::addVectorToList(V);
-  } else {
-    startupErrors.append(i18n("Failed to create vector '%1' from file '%2'.").arg(field).arg(file->fileName()));
+  if (!V->isValid()) {
+    startupErrors.append(i18n("Failed to create vector '%1' from file '%2'.  Trying again later.").arg(field).arg(file->fileName()));
 
-    delete V;
-    V = 0L;
   }
+  KST::addVectorToList(V);
 
   return V;
 }
--- trunk/extragear/graphics/kst/src/libkst/stdinsource.cpp #576346:576347
@@ -60,6 +60,15 @@
     return lastUpdateResult();
   }
 
+  if (!_valid) {
+    _src = KstDataSource::loadSource(_filename, "ASCII");
+    if (_src && _src->isValid()) {
+      _valid = true;
+    } else {
+      return setLastUpdateResult(KstObject::NO_CHANGE);
+    }
+  }
+
   fd_set rfds;
   struct timeval tv;
   int retval;