Skip to content

Commit d20920f

Browse files
committed
Fix setting recording info via HTTP
1 parent ce448ee commit d20920f

3 files changed

Lines changed: 5 additions & 5 deletions

File tree

Source/UI/ControlPanel.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1208,7 +1208,7 @@ void ControlPanel::setRecordingDirectoryPrependText(String text)
12081208
field->state = FilenameFieldComponent::State::AUTO;
12091209
else
12101210
{
1211-
String errString = FilenameFieldComponent::validate(text);
1211+
String errString = field->validate(text);
12121212
if (errString.length())
12131213
return; //TODO: Notify user of error via HTTPServer
12141214
field->state = FilenameFieldComponent::State::CUSTOM;
@@ -1251,7 +1251,7 @@ void ControlPanel::setRecordingDirectoryAppendText(String text)
12511251
field->state = FilenameFieldComponent::State::AUTO;
12521252
else
12531253
{
1254-
String errString = FilenameFieldComponent::validate(text);
1254+
String errString = field->validate(text);
12551255
if (errString.length())
12561256
return; //TODO: Notify user of error via HTTPServer
12571257
field->state = FilenameFieldComponent::State::CUSTOM;
@@ -1295,7 +1295,7 @@ void ControlPanel::setRecordingDirectoryBaseText(String text)
12951295

12961296
else if ( text.length() > 0 )
12971297
{
1298-
String errString = FilenameFieldComponent::validate(text);
1298+
String errString = field->validate(text);
12991299
if (errString.length())
13001300
return; //TODO: Notify user of error via HTTPServer
13011301
field->state = FilenameFieldComponent::State::CUSTOM;

Source/UI/FilenameConfigWindow.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ String FilenameFieldComponent::validate(String candidate)
8080

8181
String errorStr = "";
8282

83-
if (candidate.length() == 0)
83+
if (candidate.length() == 0 && state != State::NONE)
8484
errorStr = "File name must have at least 1 character.";
8585

8686
if (candidate.contains(File::getSeparatorString()))

Source/UI/FilenameConfigWindow.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ class FilenameFieldComponent :
7373
String getNextValue(bool usePlaceholderText);
7474

7575
/** Validate filename field candidate */
76-
static String validate(String field);
76+
String validate(String field);
7777

7878
Type type;
7979
State state;

0 commit comments

Comments
 (0)