From 3e4c6e9a50a1054d9f0beb7808956b1a1393ce53 Mon Sep 17 00:00:00 2001
From: Jonathan Moore Liles <j.liles@unix.net>
Date: Tue, 29 Sep 2015 22:10:19 -0700
Subject: [PATCH] Timeline: Fix determination of project name from
 command-line.

Closes #169
---
 timeline/src/Project.C  | 6 ++++--
 timeline/src/Timeline.C | 3 ++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/timeline/src/Project.C b/timeline/src/Project.C
index 3298777..4eff94f 100644
--- a/timeline/src/Project.C
+++ b/timeline/src/Project.C
@@ -329,18 +329,20 @@ Project::open ( const char *name )
     if ( created_by )
         free( created_by );
 
-    set_name( name );
 
     *_path = '\0';
+
     fl_filename_absolute( _path, sizeof( _path ), "." );
 
+    set_name( _path );
+
     _is_open = true;
 
     tle->load_timeline_settings();
 
     timeline->zoom_fit();
 
-    MESSAGE( "Loaded project \"%s\"", name );
+    MESSAGE( "Loaded project \"%s\"", _path );
 
     return 0;
 }
diff --git a/timeline/src/Timeline.C b/timeline/src/Timeline.C
index 02ad6f9..036da28 100644
--- a/timeline/src/Timeline.C
+++ b/timeline/src/Timeline.C
@@ -2052,7 +2052,8 @@ Timeline::command_load ( const char *name, const char *display_name )
         return false;
     }
 
-    Project::set_name ( display_name ? display_name : name );
+    if ( display_name )
+        Project::set_name ( display_name );
 
     apply_track_order();