Skip to content

Commit 17021a5

Browse files
author
Sergey Syrovatchenko
committed
Remove flicks when manually refresh database list
1 parent 4d7958d commit 17021a5

File tree

3 files changed

+8
-13
lines changed

3 files changed

+8
-13
lines changed

Forms/DatabaseBox.cs

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,7 @@ private void ScanDatabases(object sender, DoWorkEventArgs e) {
6060
try {
6161
connection.Open();
6262

63-
if (!Settings.ServerInfo.IsAzure && Settings.ServerInfo.IsSysAdmin) {
64-
_disks = QueryEngine.GetDiskInfo(connection);
65-
}
66-
63+
_disks = QueryEngine.GetDiskInfo(connection);
6764
_databases = QueryEngine.GetDatabases(connection);
6865
}
6966
catch (Exception ex) {
@@ -77,9 +74,11 @@ private void ScanDatabases(object sender, DoWorkEventArgs e) {
7774
}
7875

7976
private void ScanDatabasesFinish(object sender, RunWorkerCompletedEventArgs e) {
80-
if (_disks.Count > 0) {
81-
Text = $"{Resources.DatabaseBoxTitle} {string.Join(" | ", _disks.Select(_ => _.ToString()))}";
82-
}
77+
Text = _disks.Count > 0
78+
? $"{Resources.DatabaseBoxTitle} {string.Join(" | ", _disks.Select(_ => _.ToString()))}"
79+
: Resources.DatabaseBoxTitle;
80+
81+
grid.DataSource = null;
8382

8483
if (_databases.Count > 0) {
8584
var max = _databases.Max(_ => _.TotalSize);
@@ -106,10 +105,6 @@ private void RefreshDatabases() {
106105
Output.Current.Add("Refresh databases...");
107106

108107
_ts = Stopwatch.StartNew();
109-
_databases.Clear();
110-
_disks.Clear();
111-
112-
grid.DataSource = null;
113108
buttonOK.Enabled = false;
114109
buttonRefresh.Enabled = false;
115110
TotalSize.Visible = DataSize.Visible = LogSize.Visible = DataFreeSize.Visible = LogFreeSize.Visible = !Settings.ServerInfo.IsAzure;

Properties/Resources.Designer.cs

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Properties/Resources.resx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@
293293
<value>ModifyDate</value>
294294
</data>
295295
<data name="DatabaseBoxTitle" xml:space="preserve">
296-
<value>Select Databases</value>
296+
<value>Databases</value>
297297
</data>
298298
<data name="LastRead" xml:space="preserve">
299299
<value>LastRead</value>

0 commit comments

Comments
 (0)