AboutWindow: fixed invalid string pointer on application version
Change-Id: I6caf78fffddedca322464dcb4350ba03bb0b0207 Reviewed-on: https://review.haiku-os.org/c/haiku/+/6637 Tested-by: Commit checker robot <[email protected]> Reviewed-by: Adrien Destugues <[email protected]>
This commit is contained in:
@@ -85,7 +85,7 @@ public:
|
|||||||
status_t SetVersion(const char* version);
|
status_t SetVersion(const char* version);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
const char* _GetVersionFromSignature(const char* signature);
|
BString _GetVersionFromSignature(const char* signature);
|
||||||
BBitmap* _GetIconFromSignature(const char* signature);
|
BBitmap* _GetIconFromSignature(const char* signature);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
@@ -175,7 +175,7 @@ AboutView::AboutView(const char* appName, const char* signature)
|
|||||||
fNameView->SetExplicitMaxSize(BSize(B_SIZE_UNLIMITED, B_SIZE_UNSET));
|
fNameView->SetExplicitMaxSize(BSize(B_SIZE_UNLIMITED, B_SIZE_UNSET));
|
||||||
|
|
||||||
fVersionView = new BStringView("version",
|
fVersionView = new BStringView("version",
|
||||||
_GetVersionFromSignature(signature));
|
_GetVersionFromSignature(signature).String());
|
||||||
fVersionView->SetExplicitMaxSize(BSize(B_SIZE_UNLIMITED, B_SIZE_UNSET));
|
fVersionView->SetExplicitMaxSize(BSize(B_SIZE_UNLIMITED, B_SIZE_UNSET));
|
||||||
|
|
||||||
rgb_color documentColor = ui_color(B_DOCUMENT_TEXT_COLOR);
|
rgb_color documentColor = ui_color(B_DOCUMENT_TEXT_COLOR);
|
||||||
@@ -235,7 +235,7 @@ AboutView::AllAttached()
|
|||||||
// #pragma mark - AboutView private methods
|
// #pragma mark - AboutView private methods
|
||||||
|
|
||||||
|
|
||||||
const char*
|
BString
|
||||||
AboutView::_GetVersionFromSignature(const char* signature)
|
AboutView::_GetVersionFromSignature(const char* signature)
|
||||||
{
|
{
|
||||||
if (signature == NULL)
|
if (signature == NULL)
|
||||||
@@ -289,7 +289,7 @@ AboutView::_GetVersionFromSignature(const char* signature)
|
|||||||
appVersion << "-" << variety;
|
appVersion << "-" << variety;
|
||||||
}
|
}
|
||||||
|
|
||||||
return appVersion.String();
|
return appVersion;
|
||||||
}
|
}
|
||||||
|
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|||||||
Reference in New Issue
Block a user