ramenu/kolibrios
1
0
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Activity

WebView: fix #2 for clicking URLs while page loading

Browse Source 
git-svn-id: svn://kolibrios.org@4687 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Kirill Lipatov (Leency) 2014-03-23 17:33:24 +00:00
parent c23bb9bf23
commit a2554b0cac
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
programs/cmm/browser/WebView.c
View File

@ -243,6 +243,7 @@ void main()
http_free stdcall (http_transfer); http_free stdcall (http_transfer);
http_transfer=0; http_transfer=0;
PageLinks.GetAbsoluteURL(#URL); PageLinks.GetAbsoluteURL(#URL);
BrowserHistory.current--;
strcpy(#editURL, #URL); strcpy(#editURL, #URL);
OpenPage(); OpenPage();
} }
@ -463,6 +464,12 @@ void Scan(int id)
void ProcessLinks(int id) void ProcessLinks(int id)
{ {
if (http_transfer > 0)
{
StopLoading();
BrowserHistory.current--;
}
strcpy(#URL, PageLinks.GetURL(id-401)); strcpy(#URL, PageLinks.GetURL(id-401));
//$1 - Condition Script //$1 - Condition Script
if (URL[0] == '$') if (URL[0] == '$')
@ -548,6 +555,7 @@ void OpenPage()
{ {
StopLoading(); StopLoading();
strcpy(#editURL, #URL); strcpy(#editURL, #URL);
BrowserHistory.AddUrl();
if (strncmp(#URL,"WebView:",8)==0) return; if (strncmp(#URL,"WebView:",8)==0) return;
if (strncmp(#URL,"http:",5)==0) if (strncmp(#URL,"http:",5)==0)
{ {
@ -565,7 +573,6 @@ void OpenPage()
} }
else else
{ {
BrowserHistory.AddUrl();
file_size stdcall (#URL); file_size stdcall (#URL);
bufsize = EBX; bufsize = EBX;
if (bufsize) if (bufsize)