Skip to content

Commit 20a2396

Browse files
committed
fix: can not open submodule that has not been initialized
1 parent 9e91494 commit 20a2396

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

src/ViewModels/Repository.cs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2330,14 +2330,15 @@ public ContextMenu CreateContextMenuForTagSortMode()
23302330
return menu;
23312331
}
23322332

2333-
public ContextMenu CreateContextMenuForSubmodule(string submodule)
2333+
public ContextMenu CreateContextMenuForSubmodule(Models.Submodule submodule)
23342334
{
23352335
var open = new MenuItem();
23362336
open.Header = App.Text("Submodule.Open");
23372337
open.Icon = App.CreateMenuIcon("Icons.Folder.Open");
2338+
open.IsEnabled = submodule.Status != Models.SubmoduleStatus.NotInited;
23382339
open.Click += (_, ev) =>
23392340
{
2340-
OpenSubmodule(submodule);
2341+
OpenSubmodule(submodule.Path);
23412342
ev.Handled = true;
23422343
};
23432344

@@ -2346,7 +2347,7 @@ public ContextMenu CreateContextMenuForSubmodule(string submodule)
23462347
copy.Icon = App.CreateMenuIcon("Icons.Copy");
23472348
copy.Click += (_, ev) =>
23482349
{
2349-
App.CopyText(submodule);
2350+
App.CopyText(submodule.Path);
23502351
ev.Handled = true;
23512352
};
23522353

@@ -2356,7 +2357,7 @@ public ContextMenu CreateContextMenuForSubmodule(string submodule)
23562357
rm.Click += (_, ev) =>
23572358
{
23582359
if (CanCreatePopup())
2359-
ShowPopup(new DeleteSubmodule(this, submodule));
2360+
ShowPopup(new DeleteSubmodule(this, submodule.Path));
23602361
ev.Handled = true;
23612362
};
23622363

src/Views/Repository.axaml.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ private void OnSubmoduleContextRequested(object sender, ContextRequestedEventArg
183183
{
184184
if (sender is ListBox { SelectedItem: Models.Submodule submodule } grid && DataContext is ViewModels.Repository repo)
185185
{
186-
var menu = repo.CreateContextMenuForSubmodule(submodule.Path);
186+
var menu = repo.CreateContextMenuForSubmodule(submodule);
187187
menu?.Open(grid);
188188
}
189189

@@ -192,7 +192,9 @@ private void OnSubmoduleContextRequested(object sender, ContextRequestedEventArg
192192

193193
private void OnDoubleTappedSubmodule(object sender, TappedEventArgs e)
194194
{
195-
if (sender is ListBox { SelectedItem: Models.Submodule submodule } && DataContext is ViewModels.Repository repo)
195+
if (sender is ListBox { SelectedItem: Models.Submodule submodule } &&
196+
submodule.Status != Models.SubmoduleStatus.NotInited &&
197+
DataContext is ViewModels.Repository repo)
196198
{
197199
repo.OpenSubmodule(submodule.Path);
198200
}

0 commit comments

Comments
 (0)