re-open folders: check for exact path match before comparing inodes

Author: jafl

code/FileTreeTable.cpp

@@ -3341,15 +3341,32 @@ FileTreeTable::RestoreDirState
 		}
 
 		const JSize count = itsFileTreeList->GetItemCount();	// changes after Open()
+
+		bool found = false;
 		for (JIndex j=1; j<=count; j++)
 		{
-			const JString& n = (itsFileTreeList->GetDirEntry(j))->GetFullName();
-			if (JSameDirEntry(n, full))
+			const JString& n = itsFileTreeList->GetDirEntry(j)->GetFullName();
+			if (n == full)
 			{
 				itsFileTreeList->Open(j);
+				found = true;
 				break;
 			}
 		}
+
+		if (!found)
+		{
+			for (JIndex j=1; j<=count; j++)
+			{
+				const JString& n = itsFileTreeList->GetDirEntry(j)->GetFullName();
+				if (JSameDirEntry(n, full))
+				{
+					itsFileTreeList->Open(j);
+					found = true;
+					break;
+				}
+			}
+		}
 	}
 }
 
@@ -3373,7 +3390,7 @@ FileTreeTable::SaveDirState
 		if (itsFileTreeList->IsOpen(i))
 		{
 			names.Append(JConvertToRelativePath(
-				(itsFileTreeList->GetDirEntry(i))->GetFullName(), basePath));
+				itsFileTreeList->GetDirEntry(i)->GetFullName(), basePath));
 		}
 	}
 

release/doc/ChangeLog.html

@@ -13,6 +13,13 @@ <h1>System G: Changes from previous versions</h1>
 <p>Please submit all suggestions and bugs via <a href="https://github.com/jafl/jx_application_framework/issues">github</a>.</p>
 <hr>
 
+<h2>3.0.4</h2>
+
+<ul>
+	<li>Fixed edge case related to symlinks when restoring state of open sub-directories.</li>
+</ul>
+
+
 <h2>3.0.3</h2>
 
 <ul>

systemg.jcc

@@ -210,7 +210,7 @@ F
 F
 # build settings
 1
-T
+F
 "systemg"
 "${LIB_DEPS}"
 "make -k all"