Skip to content

Commit 948854a

Browse files
committed
Merge pull request #970 from mgreter/bugfix/issue_943
Refine illegal extend error across media-queries
2 parents 3681c48 + 063bb9e commit 948854a

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

extend.cpp

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1679,9 +1679,11 @@ namespace Sass {
16791679
// check if both selectors have the same media block parent
16801680
if (ext.first->media_block() == pComplexSelector->media_block()) continue;
16811681
To_String to_string(&ctx);
1682-
if (ext.second->media_block() && ext.second->media_block()->media_queries() &&
1683-
pComplexSelector->media_block() && pComplexSelector->media_block()->media_queries())
1684-
{
1682+
if (ext.second->media_block() == 0) continue;
1683+
if (pComplexSelector->media_block() &&
1684+
ext.second->media_block()->media_queries() &&
1685+
pComplexSelector->media_block()->media_queries()
1686+
) {
16851687
string query_left(ext.second->media_block()->media_queries()->perform(&to_string));
16861688
string query_right(pComplexSelector->media_block()->media_queries()->perform(&to_string));
16871689
if (query_left == query_right) continue;

0 commit comments

Comments
 (0)